FIX Bug 411836 - Folder settings for expired message stores bad values (maildir)

BUG: 411836
FIXED-IN: 5.12.2

CMakeLists.txt

@@ -66,7 +66,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
 set(LIBGRAVATAR_VERSION_LIB "5.12.1")
-set(MAILCOMMON_LIB_VERSION_LIB "5.12.1")
+set(MAILCOMMON_LIB_VERSION_LIB "5.12.2")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.1")
 set(MESSAGELIB_LIB_VERSION_LIB "5.12.1")
 set(LIBKLEO_LIB_VERSION_LIB "5.12.1")

src/kmmainwidget.cpp

@@ -1422,8 +1422,8 @@ void KMMainWidget::slotExpireFolder()
     if (!mCurrentFolderSettings) {
         return;
     }
-    bool mustDeleteExpirationAttribute = false;
+    const MailCommon::ExpireCollectionAttribute *attr = mCurrentCollection.attribute<MailCommon::ExpireCollectionAttribute>();
-    MailCommon::ExpireCollectionAttribute *attr = MailCommon::Util::expirationCollectionAttribute(mCurrentCollection, mustDeleteExpirationAttribute);
+    if (attr) {
         bool canBeExpired = true;
         if (!attr->isAutoExpire()) {
             canBeExpired = false;
@@ -1435,9 +1435,6 @@ void KMMainWidget::slotExpireFolder()
         if (!canBeExpired) {
             const QString message = i18n("This folder does not have any expiry options set");
             KMessageBox::information(this, message);
-        if (mustDeleteExpirationAttribute) {
-            delete attr;
-        }
             return;
         }
 
@@ -1447,16 +1444,11 @@ void KMMainWidget::slotExpireFolder()
             if (KMessageBox::warningContinueCancel(this, message, i18n("Expire Folder"),
                                                    KGuiItem(i18n("&Expire")))
                     != KMessageBox::Continue) {
-            if (mustDeleteExpirationAttribute) {
-                delete attr;
-            }
                 return;
             }
         }
 
         MailCommon::Util::expireOldMessages(mCurrentCollection, true /*immediate*/);
-    if (mustDeleteExpirationAttribute) {
-        delete attr;
     }
 }