Merge ...

SVN commit 628168 by dfaure:

Laurent started kmail for a brand new user, and oh surprise, there were two actions in the Folder menu
with the label "foo"! Call updateFolderMenu after creating the actions.


svn path=/branches/kdepim/enterprise/kdepim/; revision=665662

kmmainwidget.cpp

@@ -2731,10 +2731,10 @@ void KMMainWidget::setupActions()
                                       actionCollection(), "refresh_folder" );
   mTroubleshootFolderAction = 0; // set in initializeIMAPActions
 
-  mEmptyFolderAction = new KAction( "foo", "edittrash", 0, this,
+  mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this,
 		      SLOT(slotEmptyFolder()), actionCollection(), "empty" );
 
-  mRemoveFolderAction = new KAction( "foo", "editdelete", 0, this,
+  mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, this,
 		      SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
 
   mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
@@ -3164,6 +3164,7 @@ void KMMainWidget::setupActions()
   initializeIMAPActions( false ); // don't set state, config not read yet
   updateMessageActions();
   updateCustomTemplateMenus();
+  updateFolderMenu();
 }
 
 void KMMainWidget::setupForwardingActionsList()
@@ -3455,10 +3456,8 @@ void KMMainWidget::updateFolderMenu()
   mEmptyFolderAction->setText( (mFolder && kmkernel->folderIsTrash(mFolder))
     ? i18n("E&mpty Trash") : i18n("&Move All Messages to Trash") );
   mRemoveFolderAction->setEnabled( mFolder && !mFolder->isSystemFolder() && !mFolder->isReadOnly() && !multiFolder);
-  if(mFolder) {
-    mRemoveFolderAction->setText( mFolder->folderType() == KMFolderTypeSearch
+  mRemoveFolderAction->setText( mFolder && mFolder->folderType() == KMFolderTypeSearch
         ? i18n("&Delete Search") : i18n("&Delete Folder") );
-  }
   mExpireFolderAction->setEnabled( mFolder && mFolder->isAutoExpire() && !multiFolder );
   updateMarkAsReadAction();
   // the visual ones only make sense if we are showing a message list