From 1c535982476a92b49978a936c2654bae2408b8f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 21 Nov 2022 11:40:59 -0500
Subject: [PATCH] misc: update searchConversation
Change-Id: I2bb01e2846a2c543b7f17086794cd007c2ac39ae
---
daemon | 2 +-
src/libclient/conversationmodel.cpp | 2 +-
src/libclient/qtwrapper/configurationmanager_wrap.h | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/daemon b/daemon
index 08ef8dd80..e037e6358 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 08ef8dd80d571816259b195b0956a472a40b58ad
+Subproject commit e037e6358c8f720b0ece5913361dec39777004ab
diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index 23b9bc558..8ae4fe133 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -3948,7 +3948,7 @@ void
ConversationModel::getConvMediasInfos(const QString& accountId, const QString& conversationId)
{
pimpl_->currentMsgRequestId = ConfigurationManager::instance().searchConversation(
- accountId, conversationId, "", "", "", "application/data-transfer+json", 0, 0, 0);
+ accountId, conversationId, "", "", "", "application/data-transfer+json", 0, 0, 0, 0);
};
void
diff --git a/src/libclient/qtwrapper/configurationmanager_wrap.h b/src/libclient/qtwrapper/configurationmanager_wrap.h
index e66bc93d6..a943812d0 100644
--- a/src/libclient/qtwrapper/configurationmanager_wrap.h
+++ b/src/libclient/qtwrapper/configurationmanager_wrap.h
@@ -1192,7 +1192,8 @@ public Q_SLOTS: // METHODS
const QString& type,
const int64_t& after,
const int64_t& before,
- const uint32_t& maxResult)
+ const uint32_t& maxResult,
+ const int32_t& flag)
{
return libjami::searchConversation(accountId.toStdString(),
conversationId.toStdString(),
@@ -1202,7 +1203,8 @@ public Q_SLOTS: // METHODS
type.toStdString(),
after,
before,
- maxResult);
+ maxResult,
+ flag);
}
Q_SIGNALS: // SIGNALS
void volumeChanged(const QString& device, double value);
--
GitLab