Merge remote-tracking branch 'origin/Applications/17.12'

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-set(KDEPIM_VERSION_NUMBER "5.7.40")
+set(KDEPIM_VERSION_NUMBER "5.7.41")
 
 project(kmail VERSION ${KDEPIM_VERSION_NUMBER})
 

src/kmmainwidget.cpp

@@ -3316,19 +3316,17 @@ void KMMainWidget::setupActions()
     {
         mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
         actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction);
-        connect(mServerSideSubscription, &QAction::triggered,
-                this, [this] {
-            slotApplyFiltersOnFolder(/* recursive */ false);
-        });
+        connect(mApplyAllFiltersFolderAction, &QAction::triggered,
+                this, [this] { slotApplyFiltersOnFolder(/* recursive */ false);
+                });
     }
 
     {
         mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
         actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction);
-        connect(mServerSideSubscription, &QAction::triggered,
-                this, [this] {
-            slotApplyFiltersOnFolder(/* recursive */ true);
-        });
+        connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered,
+                this, [this] { slotApplyFiltersOnFolder(/* recursive */ true);
+                });
     }
 
     {