From c210a12aa548995f4ff3c009fe9f413e25ce6795 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 5 Feb 2015 22:01:49 +0100
Subject: [PATCH] Remove collection in favorite settings when collection is
 removed

---
 kmmainwidget.cpp | 13 +++++++------
 kmmainwidget.h   |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index b13cc05fe..bfe9d96cf 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -123,7 +123,6 @@ using KSieveUi::SieveDebugDialog;
 #include <akonadi/control.h>
 #include <akonadi/collectiondialog.h>
 #include <akonadi/collectionstatistics.h>
-#include <akonadi/collectionstatisticsdelegate.h>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <akonadi/kmime/messageflags.h>
 #include <akonadi/kmime/removeduplicatesjob.h>
@@ -1058,11 +1057,6 @@ void KMMainWidget::createWidgets()
 
         mFavoriteCollectionsView->setModel( mFavoritesModel );
 
-        Akonadi::CollectionStatisticsDelegate *delegate = new Akonadi::CollectionStatisticsDelegate( mFavoriteCollectionsView );
-        delegate->setProgressAnimationEnabled( true );
-        mFavoriteCollectionsView->setItemDelegate(delegate);
-        delegate->setUnreadCountShown( true );
-
         mAkonadiStandardActionManager->setFavoriteCollectionsModel( mFavoritesModel );
         mAkonadiStandardActionManager->setFavoriteSelectionModel( mFavoriteCollectionsView->selectionModel() );
     }
@@ -1137,6 +1131,8 @@ void KMMainWidget::createWidgets()
     {
         mCollectionProperties = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CollectionProperties );
     }
+    connect( kmkernel->folderCollectionMonitor(), SIGNAL(collectionRemoved(Akonadi::Collection)),
+             SLOT(slotCollectionRemoved(Akonadi::Collection)) );
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)),
              SLOT(slotItemAdded(Akonadi::Item,Akonadi::Collection)) );
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemRemoved(Akonadi::Item)),
@@ -4499,3 +4495,8 @@ void KMMainWidget::populateMessageListStatusFilterCombo()
 {
     mMessagePane->populateStatusFilterCombo();
 }
+
+void KMMainWidget::slotCollectionRemoved(const Akonadi::Collection &col)
+{
+    mFavoritesModel->removeCollection(col);
+}
diff --git a/kmmainwidget.h b/kmmainwidget.h
index 1cb616e6a..d392ea1a4 100644
--- a/kmmainwidget.h
+++ b/kmmainwidget.h
@@ -514,6 +514,7 @@ private slots:
     void slotArchiveMails();
     void slotChangeDisplayMessageFormat(MessageViewer::Viewer::DisplayFormatMessage format);
 
+    void slotCollectionRemoved(const Akonadi::Collection &col);
 private:
     // Message actions
     KAction *mDeleteAction, *mTrashThreadAction,