From bb78ff0d512b1bd56eb63b48d663db418f6121a8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 14 Jan 2010 17:52:16 +0000 Subject: [PATCH] Don't show expire setting when we can't delete message Otherwise it expire in local and re-load it when we connect to server (see bug on my kdab account). svn path=/trunk/KDE/kdepim/; revision=1074755 --- folderview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folderview.cpp b/folderview.cpp index 781a745bf..9ecbcfbbc 100644 --- a/folderview.cpp +++ b/folderview.cpp @@ -1489,7 +1489,7 @@ void FolderView::fillContextMenuFolderServiceRelatedActions( KMenu *menu, Folder if ( item->folderType() != FolderViewItem::Root ) // non account level folder { menu->addAction( mMainWidget->action( "folder_shortcut_command" ) ); - if ( !folder->noContent() ) + if ( !folder->noContent() && folder->canDeleteMessages()) menu->addAction( i18n("Expire..."), item, SLOT( slotShowExpiryProperties() ) ); // properties