Current version of Psi+ is 1.5.1930

It is based on: * psi: 0eeea8eb * plugins: 595793f * psimedia: 478567e * resources: e32ef4b
psi-plus · May 24, 2024 · 3bb1348 · 3bb1348
1 parent dbd8953
commit 3bb1348
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/iris/src/irisnet/noncore/cutestuff/bsocket.cpp b/iris/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -195,7 +195,7 @@ class HappyEyeballsConnector : public QObject {
         sd.resolver->setProtocol(XMPP::ServiceResolver::HappyEyeballs);
         connect(sd.resolver, &XMPP::ServiceResolver::srvReady, this, &HappyEyeballsConnector::splitSrvResolvers);
         // we don't care about special handling of fail. we have fallback host there anyway
-        connect(sd.resolver, &XMPP::ServiceResolver::error, this, &HappyEyeballsConnector::splitSrvResolvers);
+        connect(sd.resolver, &XMPP::ServiceResolver::srvFailed, this, &HappyEyeballsConnector::splitSrvResolvers);
         sd.state = Resolve;
         sd.resolver->start(services, transport, domain, port);
     }
@@ -459,6 +459,7 @@ void BSocket::ensureConnector()
 /* Connect to an already resolved host */
 void BSocket::connectToHost(const QHostAddress &address, quint16 port)
 {
+    BSLOG(BSDEBUG << address << port);
     resetConnection(true);
     d->address = address;
     d->port    = port;
@@ -471,6 +472,7 @@ void BSocket::connectToHost(const QHostAddress &address, quint16 port)
 /* Connect to a host via the specified protocol, or the default protocols if not specified */
 void BSocket::connectToHost(const QString &host, quint16 port, QAbstractSocket::NetworkLayerProtocol protocol)
 {
+    BSLOG(BSDEBUG << host << port << protocol);
     resetConnection(true);
     d->host  = host;
     d->port  = port;
@@ -483,6 +485,7 @@ void BSocket::connectToHost(const QString &host, quint16 port, QAbstractSocket::
 /* Connect to the hosts for the specified services */
 void BSocket::connectToHost(const QStringList &services, const QString &transport, const QString &domain, quint16 port)
 {
+    BSLOG(BSDEBUG << services << transport << domain << port);
     resetConnection(true);
     d->domain = domain;
     d->state  = Connecting;

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
@@ -3134,6 +3134,7 @@ void PsiAccount::setStatus(const Status &_s, bool withPriority, bool isManualSta
         else {
             if (!isConnected()) {
                 cleanupStream();
+                v_isActive = false;
                 login();
             }
             if (rosterDone) {

diff --git a/version b/version
@@ -1 +1 @@
-1.5.1928 (2024-05-24, 2894f024)
+1.5.1930 (2024-05-24, 0eeea8eb)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.5.1928 (2024-05-24, 2894f024)
		1.5.1930 (2024-05-24, 0eeea8eb)