Git commit 8cce4c8ef493b9cdccafbc7dd7ae8716aeed4368 by Montel Laurent. Committed on 31/10/2016 at 20:21. Pushed by mlaurent into branch 'master'. Allow to use new sieve api M +1 -1 CMakeLists.txt M +9 -1 src/sieveeditorpagewidget.cpp http://commits.kde.org/pim-sieve-editor/8cce4c8ef493b9cdccafbc7dd7ae8716aee= d4368 diff --git a/CMakeLists.txt b/CMakeLists.txt index f61d410..6cd2612 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.42") +set(LIBKSIEVE_LIB_VERSION_LIB "5.3.43") 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 a53e62e..d800ea7 100644 --- a/src/sieveeditorpagewidget.cpp +++ b/src/sieveeditorpagewidget.cpp @@ -28,7 +28,7 @@ = #include "sieveeditor_debug.h" #include - +//#define USE_CHECK_SIEVE_METHOD 1 SieveEditorPageWidget::SieveEditorPageWidget(QWidget *parent) : QWidget(parent), mWasActive(false), @@ -59,8 +59,14 @@ void SieveEditorPageWidget::slotCheckSyntaxClicked() = } mSieveEditorWidget->addNormalMessage(i18n("Uploading script to server = for checking it, please wait...")); + +#ifdef USE_CHECK_SIEVE_METHOD + KManageSieve::SieveJob *job =3D KManageSieve::SieveJob::check(mCurrent= URL, script); + connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWi= dget::slotPutResultDebug); +#else KManageSieve::SieveJob *job =3D KManageSieve::SieveJob::put(mCurrentUR= L, script, mWasActive, mWasActive); connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWi= dget::slotPutResultDebug); +#endif } = void SieveEditorPageWidget::slotPutResultDebug(KManageSieve::SieveJob *job= , bool success) @@ -75,8 +81,10 @@ void SieveEditorPageWidget::slotPutResultDebug(KManageSi= eve::SieveJob *job, bool 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 =3D KManageSieve::SieveJob::put(mCu= rrentURL, mSieveEditorWidget->originalScript(), mWasActive, mWasActive); +#endif mSieveEditorWidget->resultDone(); } =20