File disable-gmail-when-compiled-without-xoauth.patch of Package kdepim-runtime

Overview Repositories Revisions Requests Users Attributes Meta

File disable-gmail-when-compiled-without-xoauth.patch of Package kdepim-runtime (Revision ba046ad929e456375c397f240ceb61ed)

Currently displaying revision ba046ad929e456375c397f240ceb61ed , Show latest

From b5890530c0f81ecf4955d3fe98983704b16f513f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Sat, 22 Apr 2017 13:30:01 +0200
Subject: [IMAP] Disable the Gmail special cases when compiled without XOAUTH

When the IMAP resource is compiled without XOAUTH2 support, make sure
that the logic in the Settings dialog does not try to still apply the
Gmail-specific configuration.
---
 resources/imap/setupserver.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
index 7b5cee8..12a37ae 100644
--- a/resources/imap/setupserver.cpp
+++ b/resources/imap/setupserver.cpp
@@ -569,10 +569,12 @@ void SetupServer::slotTestChanged()
     m_serverTest = nullptr;
     slotSafetyChanged();
 
+#ifdef WITH_GMAIL_XOAUTH2
     // do not use imapConnectionPossible, as the data is not yet saved.
     const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
     m_ui->testButton->setEnabled(!isGmail /* TODO && Global::connectionPossible() ||
                                                 m_ui->imapServer->text() == "localhost"*/);
+#endif
 }
 
 void SetupServer::slotEnableWidgets()
@@ -594,6 +596,7 @@ void SetupServer::slotComplete()
 
 void SetupServer::slotSafetyChanged()
 {
+#ifdef WITH_GMAIL_XOAUTH2
     if (m_serverTest == nullptr) {
         const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
         qCDebug(IMAPRESOURCE_LOG) << "serverTest null";
@@ -604,7 +607,7 @@ void SetupServer::slotSafetyChanged()
         m_ui->authenticationCombo->setEnabled(!isGmail);
         return;
     }
-
+#endif
     QVector<int> protocols;
 
     switch (m_ui->safeImapGroup->checkedId()) {
@@ -704,13 +707,16 @@ void SetupServer::populateDefaultAuthenticationOptions(QComboBox *combo)
     addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::NTLM);
     addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::GSSAPI);
     addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::ANONYMOUS);
+#ifdef WITH_GMAIL_XOAUTH2
     if (Utils::isGmail(m_ui->imapServer->text())) {
         addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
     }
+#endif
 }
 
 void SetupServer::slotServerChanged()
 {
+#ifdef WITH_GMAIL_XOAUTH2
     const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
     const bool wasGmail = !m_ui->password->isEnabled();
 
@@ -733,4 +739,5 @@ void SetupServer::slotServerChanged()
         setCurrentAuthMode(m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
     }
     m_ui->authenticationCombo->setEnabled(!isGmail);
+#endif
 }
-- 
cgit v0.11.2

Places

File disable-gmail-when-compiled-without-xoauth.patch of Package kdepim-runtime (Revision ba046ad929e456375c397f240ceb61ed)

Places