projjalm/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

transition to QXMppCarbonManagerV2 if QXmpp version is heigher than 1.5.0

Browse source
This commit is contained in:
Blue 2023-03-12 01:38:54 +03:00
parent 4b68da458f
commit 8ec0af3205
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
5 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/account.cpp
View file

@ -42,7 +42,11 @@ Account::Account(const QString& p_login, const QString& p_server, const QString&
tm(new QXmppTrustManager(th)),
om(new QXmppOmemoManager(oh)),
#endif
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 5, 0)
cm(new QXmppCarbonManagerV2()),
#else
cm(new QXmppCarbonManager()),
#endif
am(new QXmppMamManager()),
mm(new QXmppMucManager()),
bm(new QXmppBookmarkManager()),
@ -86,8 +90,10 @@ Account::Account(const QString& p_login, const QString& p_server, const QString&
client.addExtension(cm);
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 5, 0)
QObject::connect(cm, &QXmppCarbonManager::messageReceived, mh, &MessageHandler::onCarbonMessageReceived);
QObject::connect(cm, &QXmppCarbonManager::messageSent, mh, &MessageHandler::onCarbonMessageSent);
#endif
client.addExtension(am);
@ -653,7 +659,9 @@ void Core::Account::setPepSupport(Shared::Support support) {
void Core::Account::handleDisconnection() {
setPepSupport(Shared::Support::unknown);
delay->disconnected();
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 5, 0)
cm->setCarbonsEnabled(false);
#endif
rh->handleOffline();
archiveQueries.clear();
}