SVN_MERGE:

Merged revisions 1074755 via svnmerge from 
https://svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1074755 | mlaurent | 2010-01-14 12:52:16 -0500 (Thu, 14 Jan 2010) | 4 lines
  
  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=/branches/work/akonadi-ports/kdepim/; revision=1075665

kmmainwidget.cpp

@@ -3196,6 +3196,9 @@ void KMMainWidget::setupActions()
   // and it should be followed by a "...", but slotExpireFolder() performs
   // an immediate expiry.
   //
+  // TODO: expire action should be disabled if there is no content or if
+  // the folder can't delete messages.
+  //
   // Leaving the action here for the moment, it and the "Expire" option in the
   // folder popup menu should be combined or at least made consistent.  Same for
   // slotExpireFolder() and FolderViewItem::slotShowExpiryProperties().