From fccf5eaca13e1b12d2fce07fcdabace0f59cca32 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 23 Sep 2015 10:02:40 +0000
Subject: [PATCH] kdepimlibs: adjust to recent changes

---
 kdepimlibs/kioslave/sieve/sieve.cpp                    | 2 +-
 kdepimlibs/mailtransport/addtransportdialog.cpp        | 1 +
 kdepimlibs/mailtransport/smtpconfigwidget.cpp          | 4 ----
 kdepimlibs/mailtransport/transportmanagementwidget.cpp | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kdepimlibs/kioslave/sieve/sieve.cpp b/kdepimlibs/kioslave/sieve/sieve.cpp
index fa58b1fe..d2a25ef9 100644
--- a/kdepimlibs/kioslave/sieve/sieve.cpp
+++ b/kdepimlibs/kioslave/sieve/sieve.cpp
@@ -1307,7 +1307,7 @@ bool kio_sieveProtocol::requestCapabilitiesAfterStartTLS() const
     const int patch = regExp.cap( 3 ).toInt();
     const QString vendor = regExp.cap( 4 );
     if ( major < 2 || (major == 2 && (minor < 3 || (minor == 3 && patch < 11))) || (vendor == "-kolab-nocaps") ) {
-      ksDebug << k_funcinfo << "Enabling compat mode for Cyrus < 2.3.11 or Cyrus marked as \"kolab-nocaps\"" << endl;
+      ksDebug << "Enabling compat mode for Cyrus < 2.3.11 or Cyrus marked as \"kolab-nocaps\"" << endl;
       return true;
     }
   }
diff --git a/kdepimlibs/mailtransport/addtransportdialog.cpp b/kdepimlibs/mailtransport/addtransportdialog.cpp
index b6a3bd88..db3ea26f 100644
--- a/kdepimlibs/mailtransport/addtransportdialog.cpp
+++ b/kdepimlibs/mailtransport/addtransportdialog.cpp
@@ -26,6 +26,7 @@
 
 #include <KDebug>
 #include <KGlobal>
+#include <KLocale>
 
 #include <akonadi/agentinstance.h>
 #include <akonadi/agentinstancecreatejob.h>
diff --git a/kdepimlibs/mailtransport/smtpconfigwidget.cpp b/kdepimlibs/mailtransport/smtpconfigwidget.cpp
index ac0dca76..47788391 100644
--- a/kdepimlibs/mailtransport/smtpconfigwidget.cpp
+++ b/kdepimlibs/mailtransport/smtpconfigwidget.cpp
@@ -31,11 +31,7 @@
 #include "servertest.h"
 #include "mailtransport_defs.h"
 
-#ifndef KDEPIM_MOBILE_UI
 #include "ui_smtpsettings_desktop.h"
-#else
-#include "ui_smtpsettings_mobile.h"
-#endif
 
 #include <QAbstractButton>
 #include <QButtonGroup>
diff --git a/kdepimlibs/mailtransport/transportmanagementwidget.cpp b/kdepimlibs/mailtransport/transportmanagementwidget.cpp
index c48f2339..e6bf87f9 100644
--- a/kdepimlibs/mailtransport/transportmanagementwidget.cpp
+++ b/kdepimlibs/mailtransport/transportmanagementwidget.cpp
@@ -28,6 +28,7 @@
 #include <KMessageBox>
 #include <KMenu>
 #include <KGlobal>
+#include <KLocale>
 
 using namespace MailTransport;