[pim/kmail-account-wizard] src: kolab resource was removed

Git commit 964ddb3112bb3f6a6e782d8a37da4e994c9c278a by Laurent Montel.
Committed on 18/07/2026 at 11:31.
Pushed by mlaurent into branch 'master'.

kolab resource was removed

M  +0    -29   src/accountconfiguration.cpp
M  +0    -2    src/accountconfiguration.h
M  +0    -1    src/qml/ManualConfigurationPage.qml

https://invent.kde.org/pim/kmail-account-wizard/-/commit/964ddb3112bb3f6a6e782d8a37da4e994c9c278a

diff --git a/src/accountconfiguration.cpp b/src/accountconfiguration.cpp
index 376f8d5c..555e73d2 100644
--- a/src/accountconfiguration.cpp
+++ b/src/accountconfiguration.cpp
@@ -89,9 +89,6 @@ QString AccountConfiguration::generateUniqueAccountName() const
     case IMAP:
         name = u"IMAP (%1)"_s.arg(mIdentity.primaryEmailAddress());
         break;
-    case KOLAB:
-        name = u"Kolab (%1)"_s.arg(mIdentity.primaryEmailAddress());
-        break;
     default:
         qCWarning(ACCOUNTWIZARD_LOG) << " invalid protocol: " << mIncomingProtocol;
         break;
@@ -157,14 +154,6 @@ Resource::ResourceInfo AccountConfiguration::createGmailResource() const
     return info;
 }
 
-Resource::ResourceInfo AccountConfiguration::createKolabResource() const
-{
-    auto info = createImapResource();
-    info.name = generateUniqueAccountName();
-    info.typeIdentifier = u"akonadi_kolab_resource"_s;
-    return info;
-}
-
 void AccountConfiguration::generateResource(const Resource::ResourceInfo &info, ConsoleLog *consoleLog)
 {
     auto resource = new Resource(consoleLog, this);
@@ -225,9 +214,6 @@ void AccountConfiguration::save(ConsoleLog *consoleLog)
     case IncomingProtocol::IMAP:
         info = createImapResource();
         break;
-    case IncomingProtocol::KOLAB:
-        info = createKolabResource();
-        break;
     default:
         qCWarning(ACCOUNTWIZARD_LOG) << " invalid protocol: " << mIncomingProtocol;
         return;
@@ -282,9 +268,6 @@ void AccountConfiguration::checkServer()
     case IMAP:
         protocol = u"imap"_s;
         break;
-    case KOLAB:
-        protocol = u"imap"_s;
-        break;
     }
     // Test input
     mServerTestInProgress = true;
@@ -331,17 +314,6 @@ void AccountConfiguration::slotTestResult(const QString &result)
             setIncomingPort(143);
         }
         break;
-    case IncomingProtocol::KOLAB: { // Kolab
-        if (result == u"ssl"_s) {
-            setIncomingPort(993);
-        } else if (result == u"tls"_s) { // tls is really STARTTLS
-            setIncomingPort(143);
-        } else if (result == u"none"_s) {
-            setIncomingPort(143);
-        } else {
-            setIncomingPort(143);
-        }
-        break;
     }
 #if 0
         // if ( server == "imap.gmail.com" ) {
@@ -367,7 +339,6 @@ void AccountConfiguration::slotTestResult(const QString &result)
         // }
 #endif
     }
-    }
 
     // TODO
     mServerTestInProgress = false;
diff --git a/src/accountconfiguration.h b/src/accountconfiguration.h
index cd9aad6c..7688088e 100644
--- a/src/accountconfiguration.h
+++ b/src/accountconfiguration.h
@@ -54,7 +54,6 @@ public:
     enum IncomingProtocol {
         IMAP,
         POP3,
-        KOLAB,
     };
     Q_ENUM(IncomingProtocol)
 
@@ -135,7 +134,6 @@ protected:
 private:
     [[nodiscard]] Resource::ResourceInfo createPop3Resource() const;
     [[nodiscard]] Resource::ResourceInfo createImapResource() const;
-    [[nodiscard]] Resource::ResourceInfo createKolabResource() const;
     [[nodiscard]] Resource::ResourceInfo createGmailResource() const;
     [[nodiscard]] QString generateUniqueAccountName() const;
     void slotTestFail();
diff --git a/src/qml/ManualConfigurationPage.qml b/src/qml/ManualConfigurationPage.qml
index 93390f96..6caa3f20 100644
--- a/src/qml/ManualConfigurationPage.qml
+++ b/src/qml/ManualConfigurationPage.qml
@@ -88,7 +88,6 @@ WizardPage {
             model: [
                 { value: AccountConfiguration.IMAP, text: i18n("IMAP") },
                 { value: AccountConfiguration.POP3, text: i18n("POP3") },
-                { value: AccountConfiguration.KOLAB, text: i18n("Kolab") },
             ]
             Component.onCompleted: {
                 currentIndex = indexOfValue(manualConfiguration.incomingProtocol);