From ce7262396eb84bcee8e33a5c38a0da1d82b0e0c5 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 26 Sep 2012 16:07:02 +0200
Subject: [PATCH] not necessary to add 'favorit collection' action when we
 don't use

favorite collection
---
 kmmainwidget.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 7367952c1..158177b4f 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1152,9 +1152,6 @@ void KMMainWidget::createWidgets()
                   << StandardActionManager::Paste
                   << StandardActionManager::DeleteItems
                   << StandardActionManager::ManageLocalSubscriptions
-                  << StandardActionManager::AddToFavoriteCollections
-                  << StandardActionManager::RemoveFromFavoriteCollections
-                  << StandardActionManager::RenameFavoriteCollection
                   << StandardActionManager::CopyCollectionToMenu
                   << StandardActionManager::CopyItemToMenu
                   << StandardActionManager::MoveItemToMenu
@@ -1166,21 +1163,22 @@ void KMMainWidget::createWidgets()
                   << StandardActionManager::ResourceProperties
                   << StandardActionManager::SynchronizeResources
                   << StandardActionManager::ToggleWorkOffline
-                  << StandardActionManager::SynchronizeCollectionsRecursive
-                  << StandardActionManager::SynchronizeFavoriteCollections;
+                  << StandardActionManager::SynchronizeCollectionsRecursive;
 
   Q_FOREACH( StandardActionManager::Type standardAction, standardActions ) {
     mAkonadiStandardActionManager->createAction( standardAction );
   }
 
-  QList<StandardActionManager::Type> favoriteActions;
-  favoriteActions << StandardActionManager::AddToFavoriteCollections
-                  << StandardActionManager::RemoveFromFavoriteCollections
-                  << StandardActionManager::RenameFavoriteCollection
-                  << StandardActionManager::SynchronizeFavoriteCollections;
 
-  Q_FOREACH( StandardActionManager::Type favoriteAction, favoriteActions) {
-    mAkonadiStandardActionManager->action( favoriteAction )->setEnabled( mEnableFavoriteFolderView );
+  if(mEnableFavoriteFolderView) {
+    QList<StandardActionManager::Type> favoriteActions;
+    favoriteActions << StandardActionManager::AddToFavoriteCollections
+                    << StandardActionManager::RemoveFromFavoriteCollections
+                    << StandardActionManager::RenameFavoriteCollection
+                    << StandardActionManager::SynchronizeFavoriteCollections;
+    Q_FOREACH( StandardActionManager::Type favoriteAction, favoriteActions) {
+      mAkonadiStandardActionManager->createAction( favoriteAction );
+    }
   }
 
   QList<StandardMailActionManager::Type> mailActions;
@@ -1190,7 +1188,7 @@ void KMMainWidget::createWidgets()
               << StandardMailActionManager::RemoveDuplicates
               << StandardMailActionManager::EmptyAllTrash
               << StandardMailActionManager::MarkMailAsRead
-	      << StandardMailActionManager::MarkMailAsUnread
+              << StandardMailActionManager::MarkMailAsUnread
               << StandardMailActionManager::MarkMailAsImportant
               << StandardMailActionManager::MarkMailAsActionItem;