From 7e7afc5517a2a642dd5da142cefc91a3d886a0bc Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 26 Sep 2012 16:06:44 +0200 Subject: [PATCH 1/2] Fix crash --- kmmainwidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index f3c27feb8..7367952c1 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -243,7 +243,7 @@ K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList ) mPreferHtmlAction = 0; mPreferHtmlLoadExtAction = 0; Akonadi::Control::widgetNeedsAkonadi( this ); - + mFavoritesModel = 0; // FIXME This should become a line separator as soon as the API // is extended in kdelibs. @@ -1010,6 +1010,7 @@ void KMMainWidget::deleteWidgets() mFavoriteCollectionsView = 0; mSplitter1 = 0; mSplitter2 = 0; + mFavoritesModel = 0; } //----------------------------------------------------------------------------- @@ -3724,6 +3725,8 @@ void KMMainWidget::setupActions() void KMMainWidget::slotAddFavoriteFolder() { + if(!mFavoritesModel) + return; selectFromAllFoldersDialog()->setCaption( i18n("Add Favorite Folder") ); if ( selectFromAllFoldersDialog()->exec() && selectFromAllFoldersDialog() ) { const Akonadi::Collection collection = selectFromAllFoldersDialog()->selectedCollection(); From ce7262396eb84bcee8e33a5c38a0da1d82b0e0c5 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 26 Sep 2012 16:07:02 +0200 Subject: [PATCH 2/2] 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 favoriteActions; - favoriteActions << StandardActionManager::AddToFavoriteCollections - << StandardActionManager::RemoveFromFavoriteCollections - << StandardActionManager::RenameFavoriteCollection - << StandardActionManager::SynchronizeFavoriteCollections; - Q_FOREACH( StandardActionManager::Type favoriteAction, favoriteActions) { - mAkonadiStandardActionManager->action( favoriteAction )->setEnabled( mEnableFavoriteFolderView ); + if(mEnableFavoriteFolderView) { + QList favoriteActions; + favoriteActions << StandardActionManager::AddToFavoriteCollections + << StandardActionManager::RemoveFromFavoriteCollections + << StandardActionManager::RenameFavoriteCollection + << StandardActionManager::SynchronizeFavoriteCollections; + Q_FOREACH( StandardActionManager::Type favoriteAction, favoriteActions) { + mAkonadiStandardActionManager->createAction( favoriteAction ); + } } QList mailActions; @@ -1190,7 +1188,7 @@ void KMMainWidget::createWidgets() << StandardMailActionManager::RemoveDuplicates << StandardMailActionManager::EmptyAllTrash << StandardMailActionManager::MarkMailAsRead - << StandardMailActionManager::MarkMailAsUnread + << StandardMailActionManager::MarkMailAsUnread << StandardMailActionManager::MarkMailAsImportant << StandardMailActionManager::MarkMailAsActionItem;