diff options
Diffstat (limited to 'net-im/psi/files')
4 files changed, 0 insertions, 165 deletions
diff --git a/net-im/psi/files/172695001826a36856024967f7fba38701a5e8c0.diff b/net-im/psi/files/172695001826a36856024967f7fba38701a5e8c0.diff deleted file mode 100644 index 0e98482..0000000 --- a/net-im/psi/files/172695001826a36856024967f7fba38701a5e8c0.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/src/miniclient.cpp b/src/miniclient.cpp -index 9b66b22c..aeb7de51 100644 ---- a/src/miniclient.cpp -+++ b/src/miniclient.cpp -@@ -121,7 +121,7 @@ void MiniClient::connectToServer(const Jid &jid, bool legacy_ssl_probe, bool leg - } - - conn = new AdvancedConnector; -- if (QCA::isSupported("tls")) { -+ if (QCA::isSupported("tls") && !QCA::KeyStoreManager().isBusy()) { - tls = new QCA::TLS; - tls->setTrustedCertificates(CertificateHelpers::allCertificates(ApplicationInfo::getCertificateStoreDirs())); - tlsHandler = new QCATLSHandler(tls); -diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp -index a25d63f2..e66065c1 100644 ---- a/src/psiaccount.cpp -+++ b/src/psiaccount.cpp -@@ -1673,17 +1673,34 @@ void PsiAccount::login() - if(isActive() && !doReconnect) - return; - -- if((d->acc.ssl == UserAccount::SSL_Yes || d->acc.ssl == UserAccount::SSL_Legacy) && !QCA::isSupported("tls")) { -- QString title; -- if (d->psi->contactList()->enabledAccounts().count() > 1) { -- title = QString("%1: ").arg(name()); -+ const bool tlsSupported = QCA::isSupported("tls"); -+ const bool keyStoreManagerAvailable = !QCA::KeyStoreManager().isBusy(); -+ if(d->acc.ssl == UserAccount::SSL_Yes || d->acc.ssl == UserAccount::SSL_Legacy) { -+ if(!tlsSupported) { -+ QString title; -+ if (d->psi->contactList()->enabledAccounts().count() > 1) { -+ title = QStringLiteral("%1: ").arg(name()); -+ } -+ title += tr("Encryption Error"); -+ QString message = tr("Cannot connect: Encryption is enabled but no QCA2 SSL/TLS plugin is available."); -+ -+ psi()->alertManager()->raiseMessageBox(AlertManager::ConnectionError, -+ QMessageBox::Information, title, message); -+ return; - } -- title += tr("Encryption Error"); -- QString message = tr("Cannot connect: Encryption is enabled but no QCA2 SSL/TLS plugin is available."); -+ if(!keyStoreManagerAvailable) { -+ // setTrustedCertificates() requires keystore manager -+ QString title; -+ if (d->psi->contactList()->enabledAccounts().count() > 1) { -+ title = QStringLiteral("%1: ").arg(name()); -+ } -+ title += tr("Encryption Error"); -+ QString message = tr("Cannot connect: Encryption is enabled but no QCA keystore manager is not available."); - -- psi()->alertManager()->raiseMessageBox(AlertManager::ConnectionError, -- QMessageBox::Information, title, message); -- return; -+ psi()->alertManager()->raiseMessageBox(AlertManager::ConnectionError, -+ QMessageBox::Information, title, message); -+ return; -+ } - } - - if(d->acc.legacy_ssl_probe) { -@@ -1728,7 +1745,7 @@ void PsiAccount::login() - - // stream - d->conn = new AdvancedConnector; -- if(d->acc.ssl != UserAccount::SSL_No && QCA::isSupported("tls")) { -+ if(d->acc.ssl != UserAccount::SSL_No && tlsSupported && keyStoreManagerAvailable) { - d->tls = new QCA::TLS; - d->tls->setTrustedCertificates(CertificateHelpers::allCertificates(ApplicationInfo::getCertificateStoreDirs())); - d->tlsHandler = new QCATLSHandler(d->tls); diff --git a/net-im/psi/files/483ad783da05144b92d35cc0baa3862d82e8bded.diff b/net-im/psi/files/483ad783da05144b92d35cc0baa3862d82e8bded.diff deleted file mode 100644 index fb78e57..0000000 --- a/net-im/psi/files/483ad783da05144b92d35cc0baa3862d82e8bded.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp -index e66065c1..42916ccc 100644 ---- a/src/psiaccount.cpp -+++ b/src/psiaccount.cpp -@@ -1323,8 +1323,6 @@ PsiAccount::~PsiAccount() - // nuke all related dialogs - deleteAllDialogs(); - -- QString str = name(); -- - while (!d->messageQueue.isEmpty()) - delete d->messageQueue.takeFirst(); - diff --git a/net-im/psi/files/9f0f3d083f025cdd501ef6e2b5e74442182e4fdf.diff b/net-im/psi/files/9f0f3d083f025cdd501ef6e2b5e74442182e4fdf.diff deleted file mode 100644 index c8898a5..0000000 --- a/net-im/psi/files/9f0f3d083f025cdd501ef6e2b5e74442182e4fdf.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index ddcc756d..c3664b64 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -555,7 +555,22 @@ int main(int argc, char *argv[]) - QCA::setProperty("pgp-always-trust", true); - QCA::KeyStoreManager keystoremgr; - QCA::KeyStoreManager::start(); -- keystoremgr.waitForBusyFinished(); // FIXME get rid of this -+ QTimer keystoremgrTimeout; -+ if(keystoremgr.isBusy()) { -+ keystoremgrTimeout.setTimerType(Qt::VeryCoarseTimer); -+ keystoremgrTimeout.setSingleShot(true); -+ keystoremgrTimeout.setInterval(7500); -+ keystoremgrTimeout.start(); -+ QObject::connect(&keystoremgr, &QCA::KeyStoreManager::busyFinished, &keystoremgrTimeout, &QTimer::stop); -+ QObject::connect(&keystoremgrTimeout, &QTimer::timeout, [] { -+ QMessageBox::warning(nullptr, -+ QApplication::applicationName(), -+ QApplication::translate("main", -+ "The keystore manager provided by QCA takes longer to load than usual." -+ " Maybe <i>gpg</i> hangs.<br><br>" -+ "Note that login via TLS and OpenPGP related features require the keystore manager.")); -+ }); -+ } - - #ifdef USE_CRASH - int useCrash = !cmdline.contains("nocrash"); -diff --git a/src/pgputil.cpp b/src/pgputil.cpp -index 5ae4be18..866d3510 100644 ---- a/src/pgputil.cpp -+++ b/src/pgputil.cpp -@@ -15,12 +15,9 @@ PGPUtil::PGPUtil() : qcaEventHandler_(NULL), passphraseDlg_(NULL), cache_no_pgp_ - qcaEventHandler_ = new QCA::EventHandler(this); - connect(qcaEventHandler_,SIGNAL(eventReady(int,const QCA::Event&)),SLOT(handleEvent(int,const QCA::Event&))); - qcaEventHandler_->start(); -- qcaKeyStoreManager_.waitForBusyFinished(); // FIXME get rid of this - connect(&qcaKeyStoreManager_, SIGNAL(keyStoreAvailable(const QString&)), SLOT(keyStoreAvailable(const QString&))); -- foreach(QString k, qcaKeyStoreManager_.keyStores()) { -- QCA::KeyStore* ks = new QCA::KeyStore(k, &qcaKeyStoreManager_); -- connect(ks, SIGNAL(updated()), SIGNAL(pgpKeysUpdated())); -- keystores_ += ks; -+ foreach(const QString& k, qcaKeyStoreManager_.keyStores()) { -+ keyStoreAvailable(k); - } - - connect(QCoreApplication::instance(),SIGNAL(aboutToQuit()),SLOT(deleteLater())); diff --git a/net-im/psi/files/e0e370aec4231398d742f4a7118bf1aab4842447.diff b/net-im/psi/files/e0e370aec4231398d742f4a7118bf1aab4842447.diff deleted file mode 100644 index c67768b..0000000 --- a/net-im/psi/files/e0e370aec4231398d742f4a7118bf1aab4842447.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp -index 42916ccc..cf38cfea 100644 ---- a/src/psiaccount.cpp -+++ b/src/psiaccount.cpp -@@ -674,7 +674,6 @@ private slots: - { - PsiContact* contact = findContact(jid); - if (contact) { -- Q_ASSERT(contact); - delete contact; - emit account->removeContact(jid); - } -@@ -1331,10 +1330,7 @@ PsiAccount::~PsiAccount() - #endif - - delete d->avCallManager; -- -- if (d->voiceCaller) -- delete d->voiceCaller; -- -+ delete d->voiceCaller; - delete d->ahcManager; - delete d->privacyManager; - delete d->pepManager; -@@ -1364,9 +1360,7 @@ PsiAccount::~PsiAccount() - void PsiAccount::cleanupStream() - { - // GSOC: Get SM state out of stream -- if (d->stream) { -- delete d->stream; -- } -+ delete d->stream; - - delete d->tls; - d->tls = 0; |