From 70c1e385b7fbffb00a089dfed4550a0cba80cb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 9 May 2019 14:36:11 +0200
Subject: [PATCH] Use multi-listener API only

---
 linphone-sdk                                | 2 +-
 src/app/logger/Logger.cpp                   | 2 +-
 src/components/assistant/AssistantModel.cpp | 2 +-
 src/components/chat/ChatModel.cpp           | 8 ++++----
 src/components/sound-player/SoundPlayer.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linphone-sdk b/linphone-sdk
index 44380577a..e33116596 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 44380577a36e41c5e9226328dac64e7b27c4d0fc
+Subproject commit e3311659629c1ed5bdbc9681becd01c01fede70e
diff --git a/src/app/logger/Logger.cpp b/src/app/logger/Logger.cpp
index c71463425..092065511 100644
--- a/src/app/logger/Logger.cpp
+++ b/src/app/logger/Logger.cpp
@@ -202,7 +202,7 @@ void Logger::init (const shared_ptr<linphone::Config> &config) {
   {
     shared_ptr<linphone::LoggingService> loggingService = mInstance->mLoggingService = linphone::LoggingService::get();
     loggingService->setLogLevel(linphone::LogLevel::Message);
-    loggingService->setListener(make_shared<LinphoneLogger>(mInstance));
+    loggingService->addListener(make_shared<LinphoneLogger>(mInstance));
   }
 
   linphone::Core::setLogCollectionPath(Utils::appStringToCoreString(folder));
diff --git a/src/components/assistant/AssistantModel.cpp b/src/components/assistant/AssistantModel.cpp
index 9bb8f3e11..918e31e53 100644
--- a/src/components/assistant/AssistantModel.cpp
+++ b/src/components/assistant/AssistantModel.cpp
@@ -150,7 +150,7 @@ AssistantModel::AssistantModel (QObject *parent) : QObject(parent) {
   mAccountCreator = core->createAccountCreator(
     core->getConfig()->getString("assistant", "xmlrpc_url", DefaultXmlrpcUri)
   );
-  mAccountCreator->setListener(mHandlers);
+  mAccountCreator->addListener(mHandlers);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/src/components/chat/ChatModel.cpp b/src/components/chat/ChatModel.cpp
index ebba5d24f..78f7a55cf 100644
--- a/src/components/chat/ChatModel.cpp
+++ b/src/components/chat/ChatModel.cpp
@@ -409,7 +409,7 @@ void ChatModel::removeAllEntries () {
 
 void ChatModel::sendMessage (const QString &message) {
   shared_ptr<linphone::ChatMessage> _message = mChatRoom->createMessage(Utils::appStringToCoreString(message));
-  _message->setListener(mMessageHandlers);
+  _message->addListener(mMessageHandlers);
 
   insertMessageAtEnd(_message);
   mChatRoom->sendChatMessage(_message);
@@ -435,7 +435,7 @@ void ChatModel::resendMessage (int id) {
     case MessageStatusFileTransferError:
     case MessageStatusNotDelivered: {
       shared_ptr<linphone::ChatMessage> message = static_pointer_cast<linphone::ChatMessage>(entry.second);
-      message->setListener(mMessageHandlers);
+      message->addListener(mMessageHandlers);
       message->resend();
 
       break;
@@ -473,7 +473,7 @@ void ChatModel::sendFileMessage (const QString &path) {
 
   shared_ptr<linphone::ChatMessage> message = mChatRoom->createFileTransferMessage(content);
   message->setFileTransferFilepath(Utils::appStringToCoreString(path));
-  message->setListener(mMessageHandlers);
+  message->addListener(mMessageHandlers);
 
   createThumbnail(message);
 
@@ -518,7 +518,7 @@ void ChatModel::downloadFile (int id) {
   }
 
   message->setFileTransferFilepath(Utils::appStringToCoreString(safeFilePath));
-  message->setListener(mMessageHandlers);
+  message->addListener(mMessageHandlers);
 
   if (!message->downloadFile())
     qWarning() << QStringLiteral("Unable to download file of entry %1.").arg(id);
diff --git a/src/components/sound-player/SoundPlayer.cpp b/src/components/sound-player/SoundPlayer.cpp
index 7c02401a9..2c2d4762e 100644
--- a/src/components/sound-player/SoundPlayer.cpp
+++ b/src/components/sound-player/SoundPlayer.cpp
@@ -143,7 +143,7 @@ void SoundPlayer::buildInternalPlayer () {
   mInternalPlayer = coreManager->getCore()->createLocalPlayer(
     Utils::appStringToCoreString(settingsModel->getRingerDevice()), "", nullptr
   );
-  mInternalPlayer->setListener(mHandlers);
+  mInternalPlayer->addListener(mHandlers);
 
   QObject::connect(settingsModel, &SettingsModel::ringerDeviceChanged, this, [this] {
     rebuildInternalPlayer();