From b99615e84a4e667f0f3a957cb3d3863c0be822c5 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 26 Jul 2018 12:09:35 -0400
Subject: [PATCH] signals: force connections as queued
Change-Id: I19be8c3a3ff257ea03d6ee9392418f5d683ae4da
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/callbackshandler.cpp | 63 ++++++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/callbackshandler.cpp b/src/callbackshandler.cpp
index 7fda8bd9..8f51c4ec 100644
--- a/src/callbackshandler.cpp
+++ b/src/callbackshandler.cpp
@@ -47,107 +47,128 @@ CallbacksHandler::CallbacksHandler(const Lrc& parent)
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::incomingAccountMessage,
this,
- &CallbacksHandler::slotNewAccountMessage);
+ &CallbacksHandler::slotNewAccountMessage,
+ Qt::QueuedConnection);
connect(&PresenceManager::instance(),
&PresenceManagerInterface::newBuddyNotification,
this,
- &CallbacksHandler::slotNewBuddySubscription);
+ &CallbacksHandler::slotNewBuddySubscription,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::contactAdded,
this,
- &CallbacksHandler::slotContactAdded);
+ &CallbacksHandler::slotContactAdded,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::contactRemoved,
this,
- &CallbacksHandler::slotContactRemoved);
+ &CallbacksHandler::slotContactRemoved,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::incomingTrustRequest,
this,
- &CallbacksHandler::slotIncomingContactRequest);
+ &CallbacksHandler::slotIncomingContactRequest,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::accountMessageStatusChanged,
this,
- &CallbacksHandler::slotAccountMessageStatusChanged);
+ &CallbacksHandler::slotAccountMessageStatusChanged,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::accountDetailsChanged,
this,
- &CallbacksHandler::slotAccountDetailsChanged);
+ &CallbacksHandler::slotAccountDetailsChanged,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::registrationStateChanged,
this,
- &CallbacksHandler::slotRegistrationStateChanged);
+ &CallbacksHandler::slotRegistrationStateChanged,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::incomingCall,
this,
- &CallbacksHandler::slotIncomingCall);
+ &CallbacksHandler::slotIncomingCall,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::callStateChanged,
this,
- &CallbacksHandler::slotCallStateChanged);
+ &CallbacksHandler::slotCallStateChanged,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::conferenceCreated,
this,
- &CallbacksHandler::slotConferenceCreated);
+ &CallbacksHandler::slotConferenceCreated,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::conferenceRemoved,
this,
- &CallbacksHandler::slotConferenceRemoved);
+ &CallbacksHandler::slotConferenceRemoved,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::conferenceChanged,
this,
- &CallbacksHandler::slotConferenceChanged);
+ &CallbacksHandler::slotConferenceChanged,
+ Qt::QueuedConnection);
connect(&CallManager::instance(),
&CallManagerInterface::incomingMessage,
this,
- &CallbacksHandler::slotIncomingMessage);
+ &CallbacksHandler::slotIncomingMessage,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::dataTransferEvent,
this,
- &CallbacksHandler::slotDataTransferEvent);
+ &CallbacksHandler::slotDataTransferEvent,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::knownDevicesChanged,
this,
- &CallbacksHandler::slotKnownDevicesChanged);
+ &CallbacksHandler::slotKnownDevicesChanged,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::deviceRevocationEnded,
this,
- &CallbacksHandler::slotDeviceRevokationEnded);
+ &CallbacksHandler::slotDeviceRevokationEnded,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::exportOnRingEnded,
this,
- &CallbacksHandler::slotExportOnRingEnded);
+ &CallbacksHandler::slotExportOnRingEnded,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::nameRegistrationEnded,
this,
- &CallbacksHandler::slotNameRegistrationEnded);
+ &CallbacksHandler::slotNameRegistrationEnded,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::registeredNameFound,
this,
- &CallbacksHandler::slotRegisteredNameFound);
+ &CallbacksHandler::slotRegisteredNameFound,
+ Qt::QueuedConnection);
connect(&ConfigurationManager::instance(),
&ConfigurationManagerInterface::migrationEnded,
this,
- &CallbacksHandler::slotMigrationEnded);
+ &CallbacksHandler::slotMigrationEnded,
+ Qt::QueuedConnection);
}
CallbacksHandler::~CallbacksHandler()
--
GitLab