Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/kmmainwidget.cpp
	kmail/manageshowcollectionproperties.cpp

kmmainwidget.cpp

@@ -1590,7 +1590,6 @@ void KMMainWidget::slotDelayedRemoveFolder(KJob *job)
 
     const Akonadi::Collection::Id id = fetchJob->property("collectionId").toLongLong();
     Akonadi::Collection col = MailCommon::Util::updatedCollection(CommonKernel->collectionFromId(id));
-    QDir dir;
     QString str;
     QString title;
     QString buttonLabel;

manageshowcollectionproperties.cpp

@@ -36,6 +36,16 @@ ManageShowCollectionProperties::ManageShowCollectionProperties(KMMainWidget *mai
     : QObject(parent),
       mMainWidget(mainWidget)
 {
+    mPages = QStringList() << QLatin1String("MailCommon::CollectionGeneralPage")
+             << QLatin1String("KMail::CollectionViewPage")
+             << QLatin1String("Akonadi::CachePolicyPage")
+             << QLatin1String("KMail::CollectionTemplatesPage")
+             << QLatin1String("MailCommon::CollectionExpiryPage")
+             << QLatin1String("PimCommon::CollectionAclPage")
+             << QLatin1String("KMail::CollectionMailingListPage")
+             << QLatin1String("KMail::CollectionQuotaPage")
+             << QLatin1String("KMail::CollectionShortcutPage")
+             << QLatin1String("KMail::CollectionMaintenancePage");
 
 }
 
@@ -69,11 +79,12 @@ void ManageShowCollectionProperties::showCollectionProperties(const QString &pag
     if (!mMainWidget->currentFolder()) {
         return;
     }
-
-    if (mHashDialogBox.contains(mMainWidget->currentFolder()->collection().id())) {
-        if (mHashDialogBox.value(mMainWidget->currentFolder()->collection().id())) {
-            mHashDialogBox.value(mMainWidget->currentFolder()->collection().id())->activateWindow();
-            mHashDialogBox.value(mMainWidget->currentFolder()->collection().id())->raise();
+    Akonadi::Collection::Id id = mMainWidget->currentFolder()->collection().id();
+    if (mHashDialogBox.contains(id)) {
+        QPointer<Akonadi::CollectionPropertiesDialog> dlg = mHashDialogBox.value(id);
+        if (dlg) {
+            dlg->activateWindow();
+            dlg->raise();
             return;
         }
     }
@@ -94,7 +105,7 @@ void ManageShowCollectionProperties::showCollectionProperties(const QString &pag
 
             Akonadi::CollectionAttributesSynchronizationJob *sync
                 = new Akonadi::CollectionAttributesSynchronizationJob(mMainWidget->currentFolder()->collection());
-            sync->setProperty("collectionId", mMainWidget->currentFolder()->collection().id());
+            sync->setProperty("collectionId", id);
             sync->setProperty("pageToShow", pageToShow);          // note for dialog later
             sync->setProperty("progressItem", QVariant::fromValue(progressItem));
             connect(sync, SIGNAL(result(KJob*)),
@@ -180,18 +191,7 @@ void ManageShowCollectionProperties::slotCollectionPropertiesFinished(KJob *job)
 
     const Akonadi::Collection collection = fetch->collections().first();
 
-    const QStringList pages = QStringList() << QLatin1String("MailCommon::CollectionGeneralPage")
-                              << QLatin1String("KMail::CollectionViewPage")
-                              << QLatin1String("Akonadi::CachePolicyPage")
-                              << QLatin1String("KMail::CollectionTemplatesPage")
-                              << QLatin1String("MailCommon::CollectionExpiryPage")
-                              << QLatin1String("PimCommon::CollectionAclPage")
-                              << QLatin1String("KMail::CollectionMailingListPage")
-                              << QLatin1String("KMail::CollectionQuotaPage")
-                              << QLatin1String("KMail::CollectionShortcutPage")
-                              << QLatin1String("KMail::CollectionMaintenancePage");
-
-    QPointer<Akonadi::CollectionPropertiesDialog> dlg = new Akonadi::CollectionPropertiesDialog(collection, pages, mMainWidget);
+    QPointer<Akonadi::CollectionPropertiesDialog> dlg = new Akonadi::CollectionPropertiesDialog(collection, mPages, mMainWidget);
     dlg->setWindowTitle(i18nc("@title:window", "Properties of Folder %1", collection.name()));
 
     const QString pageToShow = fetch->property("pageToShow").toString();

manageshowcollectionproperties.h

@@ -54,6 +54,7 @@ private:
 
 private:
     QHash<Akonadi::Collection::Id, QPointer<Akonadi::CollectionPropertiesDialog> > mHashDialogBox;
+    QStringList mPages;
     KMMainWidget *mMainWidget;
 };