Hello community, here is the log from the commit of package libksieve for openSUSE:Factory checked in at 2017-06-12 15:24:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksieve (Old) and /work/SRC/openSUSE:Factory/.libksieve.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksieve" Mon Jun 12 15:24:28 2017 rev:15 rq:502119 version:17.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libksieve/libksieve.changes 2017-05-22 10:44:38.436956375 +0200 +++ /work/SRC/openSUSE:Factory/.libksieve.new/libksieve.changes 2017-06-12 15:24:30.639405012 +0200 @@ -1,0 +2,15 @@ +Wed Jun 07 17:43:01 CEST 2017 - lbeltr...@kde.org + +- Update to 17.04.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.2.php +- Changes since 17.04.1: + * Fix order of attributes + * Add newline after each error message + * Don't add empty requires + * Don't double quote when we have a list + * Fix generate body element when we have a list + * Body supports list too + +------------------------------------------------------------------- Old: ---- libksieve-17.04.1.tar.xz New: ---- libksieve-17.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksieve.spec ++++++ --- /var/tmp/diff_new_pack.DDc941/_old 2017-06-12 15:24:31.391298911 +0200 +++ /var/tmp/diff_new_pack.DDc941/_new 2017-06-12 15:24:31.395298346 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: libksieve -Version: 17.04.1 +Version: 17.04.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) ++++++ libksieve-17.04.1.tar.xz -> libksieve-17.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/CMakeLists.txt new/libksieve-17.04.2/CMakeLists.txt --- old/libksieve-17.04.1/CMakeLists.txt 2017-05-09 02:29:54.000000000 +0200 +++ new/libksieve-17.04.2/CMakeLists.txt 2017-06-06 02:27:14.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.1") +set(PIM_VERSION "5.5.2") project(libksieve VERSION ${PIM_VERSION}) @@ -22,13 +22,13 @@ set(LIBKSIEVE_LIB_VERSION ${PIM_VERSION}) set(QT_REQUIRED_VERSION "5.6.0") -set(KMIME_LIB_VERSION "5.5.1") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.5.1") -set(KMAILTRANSPORT_LIB_VERSION "5.5.1") -set(KPIMTEXTEDIT_LIB_VERSION "5.5.1") -set(LIBKDEPIM_LIB_VERSION "5.5.1") -set(PIMCOMMON_LIB_VERSION "5.5.1") -set(KIMAP_LIB_VERSION "5.5.1") +set(KMIME_LIB_VERSION "5.5.2") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.5.2") +set(KMAILTRANSPORT_LIB_VERSION "5.5.2") +set(KPIMTEXTEDIT_LIB_VERSION "5.5.2") +set(LIBKDEPIM_LIB_VERSION "5.5.2") +set(PIMCOMMON_LIB_VERSION "5.5.2") +set(KIMAP_LIB_VERSION "5.5.2") option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/fr/libksieve.po new/libksieve-17.04.2/po/fr/libksieve.po --- old/libksieve-17.04.1/po/fr/libksieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/fr/libksieve.po 2017-06-06 02:27:13.000000000 +0200 @@ -2092,7 +2092,7 @@ #: ksieveui/editor/sieveeditormenubar.cpp:64 #, kde-format msgid "Go to Line" -msgstr "" +msgstr "Aller à la ligne" #: ksieveui/editor/sieveeditormenubar.cpp:69 #, fuzzy, kde-format @@ -2141,7 +2141,7 @@ #, kde-format msgctxt "@title:menu" msgid "Tools" -msgstr "" +msgstr "Outils" #: ksieveui/editor/sieveeditortabwidget.cpp:63 #, fuzzy, kde-format @@ -2330,7 +2330,7 @@ #: ksieveui/editor/webengine/findbar/findbarbase.cpp:100 #, kde-format msgid "Phrase not found" -msgstr "" +msgstr "Impossible de trouver la phrase" #: ksieveui/editor/webengine/sieveeditorwebengineview.cpp:61 #, kde-format @@ -2532,7 +2532,7 @@ #: ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp:48 #, kde-format msgid "Apply Changes" -msgstr "" +msgstr "Appliquer les changements" #: ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp:54 #, kde-format @@ -2542,7 +2542,7 @@ #: ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp:68 #, kde-format msgid "Extension:" -msgstr "" +msgstr "Extension : " #: ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp:73 #, kde-format @@ -2554,7 +2554,7 @@ #: ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp:111 #, kde-format msgid "Debug" -msgstr "" +msgstr "Déboguer" #: ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp:144 #, fuzzy, kde-format @@ -2580,7 +2580,7 @@ #: ksieveui/sievescriptdebugger/sievescriptdebuggerresulteditor.cpp:44 #, kde-format msgid "Clear" -msgstr "" +msgstr "Effacer" #: ksieveui/sievescriptdebugger/sievescriptdebuggerresulteditor.cpp:55 #, fuzzy, kde-format @@ -2804,12 +2804,12 @@ #: ksieveui/vacation/vacationeditwidget.cpp:106 #, kde-format msgid "Start date:" -msgstr "" +msgstr "Date de départ : " #: ksieveui/vacation/vacationeditwidget.cpp:134 #, kde-format msgid "End date:" -msgstr "" +msgstr "Date de fin : " #: ksieveui/vacation/vacationeditwidget.cpp:152 #: ksieveui/vacation/vacationeditwidget.cpp:291 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/he/kio_sieve.po new/libksieve-17.04.2/po/he/kio_sieve.po --- old/libksieve-17.04.1/po/he/kio_sieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/he/kio_sieve.po 2017-06-06 02:27:13.000000000 +0200 @@ -1,19 +1,19 @@ # translation of kio_sieve.po to Hebrew # Diego Iastrubni <elc...@kde.org>, 2005. -# +# Elkana Bardugo <ttv...@gmail.com>, 2017. #zanata msgid "" msgstr "" "Project-Id-Version: kio_sieve\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:19+0100\n" -"PO-Revision-Date: 2005-09-16 22:37+0300\n" -"Last-Translator: Diego Iastrubni <elc...@kde.org>\n" +"PO-Revision-Date: 2017-05-16 07:05-0400\n" +"Last-Translator: Copied by Zanata <copied-by-zan...@zanata.org>\n" "Language-Team: Hebrew <kde-l10n...@kde.org>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11\n" +"X-Generator: Zanata 3.9.6\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sieve.cpp:336 @@ -73,7 +73,6 @@ #: sieve.cpp:390 #, fuzzy, kde-format -#| msgid "Authentication failed." msgid "Connection Failed" msgstr "האימות נכשל." @@ -96,7 +95,6 @@ #: sieve.cpp:476 #, fuzzy, kde-format -#| msgid "Done." msgctxt "special command completed" msgid "Done." msgstr "הסתיים." @@ -161,7 +159,6 @@ #: sieve.cpp:685 #, fuzzy, kde-format -#| msgid "Done." msgctxt "data upload complete" msgid "Done." msgstr "הסתיים." @@ -183,7 +180,6 @@ #: sieve.cpp:781 #, fuzzy, kde-format -#| msgid "Done." msgctxt "data retrival complete" msgid "Done." msgstr "הסתיים." @@ -205,7 +201,6 @@ #: sieve.cpp:817 #, fuzzy, kde-format -#| msgid "Done." msgctxt "file removal complete" msgid "Done." msgstr "הסתיים." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/it/libksieve.po new/libksieve-17.04.2/po/it/libksieve.po --- old/libksieve-17.04.1/po/it/libksieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/it/libksieve.po 2017-06-06 02:27:13.000000000 +0200 @@ -1,7 +1,7 @@ # translation of libksieve.po to Italian # Copyright (C) 2003 Free Software Foundation, Inc. # Luciano Montanaro <mikel...@cirulla.net>, 2003, 2010, 2011, 2012. -# Luigi Toscano <luigi.tosc...@tiscali.it>, 2013, 2014, 2015, 2016. +# Luigi Toscano <luigi.tosc...@tiscali.it>, 2013, 2014, 2015, 2016, 2017. # msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/sr/libksieve.po new/libksieve-17.04.2/po/sr/libksieve.po --- old/libksieve-17.04.1/po/sr/libksieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/sr/libksieve.po 2017-06-06 02:27:14.000000000 +0200 @@ -1,6 +1,6 @@ # Translation of libksieve.po into Serbian. # Toplica Tanaskovic <top...@kde.org.yu>, 2003. -# Chusslove Illich <caslav.i...@gmx.net>, 2011, 2012, 2013, 2014, 2015, 2016. +# Chusslove Illich <caslav.i...@gmx.net>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: libksieve\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/tr/kio_sieve.po new/libksieve-17.04.2/po/tr/kio_sieve.po --- old/libksieve-17.04.1/po/tr/kio_sieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/tr/kio_sieve.po 2017-06-06 02:27:14.000000000 +0200 @@ -20,9 +20,9 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"(http://www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.4\n" +"(http: //www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n" #: sieve.cpp:336 #, kde-format @@ -241,8 +241,8 @@ "Please enter your authentication details for your sieve account (usually the " "same as your email password):" msgstr "" -"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz " -"(genellikle e-posta parolanızla aynıdır):" +"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz (" +"genellikle e-posta parolanızla aynıdır):" #: sieve.cpp:1094 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/po/tr/libksieve.po new/libksieve-17.04.2/po/tr/libksieve.po --- old/libksieve-17.04.1/po/tr/libksieve.po 2017-05-09 02:29:53.000000000 +0200 +++ new/libksieve-17.04.2/po/tr/libksieve.po 2017-06-06 02:27:14.000000000 +0200 @@ -75,8 +75,8 @@ "Please enter your authentication details for your sieve account (usually the " "same as your email password):" msgstr "" -"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz " -"(genellikle e-posta parolanızla aynıdır):" +"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz (" +"genellikle e-posta parolanızla aynıdır):" #: kmanagesieve/sessionthread.cpp:305 #, kde-format @@ -230,8 +230,8 @@ "Too many argument found for \"%1\", max value is %2, number of value found " "%3 for %4" msgstr "" -"\"%1\" için çok fazla bağımsız değişken bulundu, %2 maksimum değer, %4 için " -"%3 değeri bulundu" +"\"%1\" için çok fazla bağımsız değişken bulundu, %2 maksimum değer, %4 için %" +"3 değeri bulundu" #: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:134 #: ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp:118 @@ -544,8 +544,8 @@ "add new headers." msgstr "" "\"yeninden yönlendirme\" eylemi iletiyi başka bir kullanıcıya sağlanan " -"adreste gönderir, bunu bir e-posta yönlendirme özelliği gibi yapar. " -"\"yeniden yönlendirme\" eylemi ileti gövdesinde ya da var olan başlıklarda " +"adreste gönderir, bunu bir e-posta yönlendirme özelliği gibi yapar. \"" +"yeniden yönlendirme\" eylemi ileti gövdesinde ya da var olan başlıklarda " "herhangi bir değişiklik yapmaz, ancak yeni başlıklar ekleyebilir." #: ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp:157 @@ -1242,8 +1242,8 @@ "mechanism." msgstr "" "\"spamtest\" testi yapan Sieve gerçeklemeleri yetenek mekanizmasıyla " -"birlikte kullanabilmek için belirteç olarak \"spamtest\" veya \"spamtestplus" -"\" kullanırlar." +"birlikte kullanabilmek için belirteç olarak \"spamtest\" veya \"" +"spamtestplus\" kullanırlar." #: ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp:29 #, kde-format @@ -2166,8 +2166,8 @@ "Some errors were found during parsing. <a href=\"sieveerrordetails" "\">(Details...)</a>" msgstr "" -"Ayrıştırma sırasında bazı hatalar bulundu. <a href=\"sieveerrordetails" -"\">(Ayrıntılar...)</a>" +"Ayrıştırma sırasında bazı hatalar bulundu. <a href=\"sieveerrordetails\"" +">(Ayrıntılar...)</a>" #: ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp:40 #, kde-format @@ -2588,7 +2588,7 @@ "You have not yet configured an IMAP server for this. You can do this on the " "\"Filtering\" tab of the IMAP account configuration." msgstr "" -"Kmail'in Ofis Dışındayım yanıtlama özelliği sunucu bağımlıdır. Bunun için " +"KMail'in Ofis Dışındayım yanıtlama özelliği sunucu bağımlıdır. Bunun için " "bir IMAP sunucu ayarı yapılandırmadınız. Bu işlemi IMAP hesap yapılandırması " "altındaki \"Filtreleme\" sekmesinden tamamlayabilirsiniz." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/autocreatescriptutil.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/autocreatescriptutil.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/autocreatescriptutil.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/autocreatescriptutil.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -165,7 +165,7 @@ void AutoCreateScriptUtil::comboboxItemNotFound(const QString &searchItem, const QString &name, QString &error) { - error += i18n("Cannot find item \"%1\" in widget \"%2\"", searchItem, name); + error += i18n("Cannot find item \"%1\" in widget \"%2\"", searchItem, name) + QLatin1Char('\n'); } QString AutoCreateScriptUtil::createFullWhatsThis(const QString &help, const QString &href) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -44,12 +44,12 @@ } if (code.count() < 2) { - error += i18n("Not enough arguments for SelectConvertParameterWidget. Expected 2 arguments."); + error += i18n("Not enough arguments for SelectConvertParameterWidget. Expected 2 arguments.") + QLatin1Char('\n'); qCDebug(LIBKSIEVE_LOG) << " SelectConvertParameterWidget::setCode parsing error ?"; return; } if (code.count() > 2) { - error += i18n("Too many arguments for SelectConvertParameterWidget, \"%1\"", code.count()); + error += i18n("Too many arguments for SelectConvertParameterWidget, \"%1\"", code.count()) + QLatin1Char('\n'); qCDebug(LIBKSIEVE_LOG) << " too many argument " << code.count(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -110,7 +110,7 @@ QCheckBox *protectAgainstUseRegexp = w->findChild<QCheckBox *>(QStringLiteral("regexprotect")); protectAgainstUseRegexp->setChecked(true); } else { - error += QLatin1Char('\n') + i18n("Script needs regex support, but server does not have it."); + error += i18n("Script needs regex support, but server does not have it.") + QLatin1Char('\n'); } } else { SelectVariableModifierComboBox *modifier = w->findChild<SelectVariableModifierComboBox *>(QStringLiteral("modifier")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -381,7 +381,7 @@ const QString actionName = e.attribute(QStringLiteral("name")); if (tagName == QLatin1String("control") && actionName == QLatin1String("if")) { qCDebug(LIBKSIEVE_LOG) << "We found an loop if in a loop if. Not supported"; - error += QLatin1Char('\n') + i18n("We detected a loop if in a loop if. It's not supported") + QLatin1Char('\n'); + error += i18n("We detected a loop if in a loop if. It's not supported") + QLatin1Char('\n'); } if (firstAction) { firstAction = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -95,7 +95,7 @@ QStringList SieveConditionAddress::needRequires(QWidget *w) const { const SelectAddressPartComboBox *selectAddressPart = w->findChild<SelectAddressPartComboBox *>(QStringLiteral("addresspartcombobox")); - return QStringList() << selectAddressPart->extraRequire(); + return selectAddressPart->extraRequire(); } QString SieveConditionAddress::help() const @@ -160,10 +160,18 @@ selectAddressPart->setCode(AutoCreateScriptUtil::tagValue(lstTagValue.at(0)), name(), error); } } else if (lstTagValue.count() == 2) { + QString errorStr; SelectAddressPartComboBox *selectAddressPart = w->findChild<SelectAddressPartComboBox *>(QStringLiteral("addresspartcombobox")); - selectAddressPart->setCode(AutoCreateScriptUtil::tagValue(lstTagValue.at(0)), name(), error); - SelectMatchTypeComboBox *selectMatchCombobox = w->findChild<SelectMatchTypeComboBox *>(QStringLiteral("matchtypecombobox")); - selectMatchCombobox->setCode(AutoCreateScriptUtil::tagValueWithCondition(lstTagValue.at(1), notCondition), name(), error); + selectAddressPart->setCode(AutoCreateScriptUtil::tagValue(lstTagValue.at(0)), name(), errorStr); + if (errorStr.isEmpty()) { + SelectMatchTypeComboBox *selectMatchCombobox = w->findChild<SelectMatchTypeComboBox *>(QStringLiteral("matchtypecombobox")); + selectMatchCombobox->setCode(AutoCreateScriptUtil::tagValueWithCondition(lstTagValue.at(1), notCondition), name(), error); + } else { //Problem with order + SelectMatchTypeComboBox *selectMatchCombobox = w->findChild<SelectMatchTypeComboBox *>(QStringLiteral("matchtypecombobox")); + selectMatchCombobox->setCode(AutoCreateScriptUtil::tagValueWithCondition(lstTagValue.at(0), notCondition), name(), error); + SelectAddressPartComboBox *selectAddressPart = w->findChild<SelectAddressPartComboBox *>(QStringLiteral("addresspartcombobox")); + selectAddressPart->setCode(AutoCreateScriptUtil::tagValue(lstTagValue.at(1)), name(), error); + } } else if (lstTagValue.count() > 2) { tooManyArgument(QStringLiteral("tag"), lstTagValue.count(), 2, error); qCDebug(LIBKSIEVE_LOG) << "SieveConditionAddress::setParamWidgetValue too many argument :" << lstTagValue.count(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -70,8 +70,8 @@ const QString matchValue = matchType->code(isNegative); QLineEdit *edit = w->findChild<QLineEdit *>(QStringLiteral("edit")); - const QString editValue = edit->text(); - return AutoCreateScriptUtil::negativeString(isNegative) + QStringLiteral("body %1 %2 \"%3\"").arg(bodyValue, matchValue, editValue); + const QString editValue = AutoCreateScriptUtil::createAddressList(edit->text().trimmed(), false); + return AutoCreateScriptUtil::negativeString(isNegative) + QStringLiteral("body %1 %2 %3").arg(bodyValue, matchValue, editValue); } QStringList SieveConditionBody::needRequires(QWidget *) const @@ -101,6 +101,7 @@ QStringList tagValueList; QStringList strValue; + bool wasListElement = false; QDomNode node = element.firstChild(); while (!node.isNull()) { QDomElement e = node.toElement(); @@ -124,6 +125,10 @@ //nothing } else if (tagName == QLatin1String("comment")) { //implement in the future ? + } else if (tagName == QLatin1String("list")) { + strValue << AutoCreateScriptUtil::listValueToStr(e); + wasListElement = true; + ++indexStr; } else { unknownTag(tagName, error); qCDebug(LIBKSIEVE_LOG) << " SieveConditionBody::setParamWidgetValue unknown tagName " << tagName; @@ -138,7 +143,7 @@ SelectMatchTypeComboBox *matchType = w->findChild<SelectMatchTypeComboBox *>(QStringLiteral("matchtype")); matchType->setCode(tagValueList.at(1), name(), error); QLineEdit *edit = w->findChild<QLineEdit *>(QStringLiteral("edit")); - edit->setText(AutoCreateScriptUtil::quoteStr(strValue.at(0))); + edit->setText(wasListElement ? strValue.at(0) : AutoCreateScriptUtil::quoteStr(strValue.at(0))); } else if (strValue.count() == 2) { SelectBodyTypeWidget *bodyType = w->findChild<SelectBodyTypeWidget *>(QStringLiteral("bodytype")); bodyType->setCode(tagValueList.at(0), indexStr == 2 ? strValue.at(0) : QString(), name(), error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -52,12 +52,13 @@ return itemData(currentIndex()).toString(); } -QString SelectAddressPartComboBox::extraRequire() const +QStringList SelectAddressPartComboBox::extraRequire() const { + QStringList lst; if (mHasSubaddressCapability) { - return QStringLiteral("subaddress"); + lst = QStringList() << QStringLiteral("subaddress"); } - return QString(); + return lst; } void SelectAddressPartComboBox::setCode(const QString &code, const QString &name, QString &error) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.h new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.h --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.h 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.h 2017-05-24 07:57:44.000000000 +0200 @@ -34,7 +34,7 @@ QString code() const; void setCode(const QString &code, const QString &name, QString &error); - QString extraRequire() const; + QStringList extraRequire() const; Q_SIGNALS: void valueChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -104,13 +104,13 @@ if (tagValue == QLatin1String("name")) { mName->setText(AutoCreateScriptUtil::strValue(e)); } else { - error += i18n("Unknown tagValue \"%1\" during loading loop \"for\"", tagValue); + error += i18n("Unknown tagValue \"%1\" during loading loop \"for\"", tagValue) + QLatin1Char('\n'); qCDebug(LIBKSIEVE_LOG) << " SieveForEveryPartWidget::loadScript unknown tagValue " << tagValue; } mForLoop->setChecked(true); mName->setEnabled(true); } else { - error += i18n("Unknown tag \"%1\" during loading loop \"for\"", tagName); + error += i18n("Unknown tag \"%1\" during loading loop \"for\"", tagName) + QLatin1Char('\n'); qCDebug(LIBKSIEVE_LOG) << " SieveForEveryPartWidget::loadScript unknown tagName " << tagName; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -128,7 +128,7 @@ if (tagName == QLatin1String("str")) { mVariableName->setText(e.text()); } else { - error += i18n("Unknown tag \"%1\" during loading of variables."); + error += i18n("Unknown tag \"%1\" during loading of variables.") + QLatin1Char('\n'); qCDebug(LIBKSIEVE_LOG) << " SieveGlobalVariableActionWidget::loadScript unknown tagName " << tagName; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveincludewidget.cpp new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveincludewidget.cpp --- old/libksieve-17.04.1/src/ksieveui/autocreatescripts/sieveincludewidget.cpp 2017-05-01 17:24:33.000000000 +0200 +++ new/libksieve-17.04.2/src/ksieveui/autocreatescripts/sieveincludewidget.cpp 2017-05-24 07:57:44.000000000 +0200 @@ -69,7 +69,7 @@ if (index != -1) { setCurrentIndex(index); } else { - error += i18n("Unknown location type \"%1\" during parsing includes", code); + error += i18n("Unknown location type \"%1\" during parsing includes", code) + QLatin1Char('\n'); setCurrentIndex(0); } }
