From f63257ec8b90d1b876f276e3eb1c97e0b98562fe Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 2 Nov 2016 13:45:11 +0100
Subject: [PATCH] USe new class to check script

---
 CMakeLists.txt                |  2 +-
 src/sieveeditorpagewidget.cpp | 32 ++++++++++++--------------------
 src/sieveeditorpagewidget.h   |  4 ++--
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8165661..082963f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
 
 set(MESSAGELIB_LIB_VERSION_LIB "5.3.47")
-set(LIBKSIEVE_LIB_VERSION_LIB "5.3.44")
+set(LIBKSIEVE_LIB_VERSION_LIB "5.3.45")
 set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
 
 set(QT_REQUIRED_VERSION "5.6.0")
diff --git a/src/sieveeditorpagewidget.cpp b/src/sieveeditorpagewidget.cpp
index bf12983..de554a3 100644
--- a/src/sieveeditorpagewidget.cpp
+++ b/src/sieveeditorpagewidget.cpp
@@ -19,6 +19,7 @@
 
 #include "sieveeditorpagewidget.h"
 #include "ksieveui/sieveeditorwidget.h"
+#include "ksieveui/checkscriptjob.h"
 #include "sieveeditorglobalconfig.h"
 
 #include <kmanagesieve/sievejob.h>
@@ -28,7 +29,7 @@
 
 #include "sieveeditor_debug.h"
 #include <QVBoxLayout>
-//#define USE_CHECK_SIEVE_METHOD 1
+
 SieveEditorPageWidget::SieveEditorPageWidget(QWidget *parent)
     : QWidget(parent),
       mWasActive(false),
@@ -60,31 +61,22 @@ void SieveEditorPageWidget::slotCheckSyntaxClicked()
     }
     mSieveEditorWidget->addNormalMessage(i18n("Uploading script to server for checking it, please wait..."));
 
-#ifdef USE_CHECK_SIEVE_METHOD
-    KManageSieve::SieveJob *job = KManageSieve::SieveJob::check(mCurrentURL, script);
-    connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWidget::slotPutResultDebug);
-#else
-    KManageSieve::SieveJob *job = KManageSieve::SieveJob::put(mCurrentURL, script, mWasActive, mWasActive);
-    connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWidget::slotPutResultDebug);
-#endif
+    KSieveUi::CheckScriptJob *checkScriptJob = new KSieveUi::CheckScriptJob(this);
+    connect(checkScriptJob, &KSieveUi::CheckScriptJob::finished, this, &SieveEditorPageWidget::slotCheckScriptJobFinished);
+    checkScriptJob->setUrl(mCurrentURL);
+    checkScriptJob->setIsActive(mWasActive);
+    checkScriptJob->setCurrentScript(script);
+    checkScriptJob->setOriginalScript(mSieveEditorWidget->originalScript());
+    checkScriptJob->start();
 }
 
-void SieveEditorPageWidget::slotPutResultDebug(KManageSieve::SieveJob *job, bool success)
+void SieveEditorPageWidget::slotCheckScriptJobFinished(const QString &errorMsg, bool success)
 {
     if (success) {
-        mSieveEditorWidget->addOkMessage(i18n("No errors found."));
+        mSieveEditorWidget->addOkMessage(errorMsg);
     } else {
-        const QString errorMsg = job->errorString();
-        if (errorMsg.isEmpty()) {
-            mSieveEditorWidget->addFailedMessage(i18n("An unknown error was encountered."));
-        } else {
-            mSieveEditorWidget->addFailedMessage(errorMsg);
-        }
+        mSieveEditorWidget->addFailedMessage(errorMsg);
     }
-#ifndef USE_CHECK_SIEVE_METHOD
-    //Put original script after check otherwise we will put a script even if we don't click on ok
-    KManageSieve::SieveJob *restoreJob = KManageSieve::SieveJob::put(mCurrentURL, mSieveEditorWidget->originalScript(), mWasActive, mWasActive);
-#endif
     mSieveEditorWidget->resultDone();
 }
 
diff --git a/src/sieveeditorpagewidget.h b/src/sieveeditorpagewidget.h
index 7d210ff..4b9715c 100644
--- a/src/sieveeditorpagewidget.h
+++ b/src/sieveeditorpagewidget.h
@@ -98,9 +98,9 @@ Q_SIGNALS:
 private Q_SLOTS:
     void slotGetResult(KManageSieve::SieveJob *, bool success, const QString &script, bool isActive);
     void slotCheckSyntaxClicked();
-    void slotPutResultDebug(KManageSieve::SieveJob *, bool success);
     void slotPutResult(KManageSieve::SieveJob *, bool success);
-    void slotValueChanged(bool b);
+    void slotValueChanged(bool b);    
+    void slotCheckScriptJobFinished(const QString &errorMsg, bool success);
 
 private:
     void setModified(bool b);
-- 
GitLab