Fixed "Folder Menu not updated after enabling Expiration for a Folder", approved by Ingo.

BUG: 92918

svn path=/branches/KDE_3_3_BRANCH/kdepim/; revision=365627

kmfoldertree.cpp

@@ -241,13 +241,9 @@ void KMFolderTreeItem::properties()
   if ( !mFolder )
     return;
 
-  KMFolderDialog *props;
-
-  props = new KMFolderDialog( mFolder, mFolder->parent(), static_cast<KMFolderTree *>( listView() ),
-                              i18n("Properties of Folder %1").arg( mFolder->label() ) );
-  props->exec();
-  //Nothing here the above exec() may actually delete this KMFolderTreeItem
-  return;
+  KMFolderTree* tree = static_cast<KMFolderTree*>( listView() );
+  tree->mainWidget()->modifyFolder( this );
+  //Nothing here the above may actually delete this KMFolderTreeItem
 }
 
 //=============================================================================

kmmainwidget.cpp

@@ -887,7 +887,19 @@ void KMMainWidget::slotModifyFolder()
   if (!mFolderTree) return;
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( mFolderTree->currentItem() );
   if ( item )
-    item->properties();
+    modifyFolder( item );
+}
+
+//-----------------------------------------------------------------------------
+void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
+{
+  KMFolder* folder = folderItem->folder();
+  KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
+  KMFolderDialog *props = new KMFolderDialog( folder, folder->parent(), folderTree,
+                                              i18n("Properties of Folder %1").arg( folder->label() ) );
+  props->exec();
+  delete props;
+  updateFolderMenu();
 }
 
 //-----------------------------------------------------------------------------

kmmainwidget.h

@@ -142,6 +142,8 @@ public:
 
   KMSystemTray *systray() const;
 
+  void modifyFolder( KMFolderTreeItem* folderItem );
+
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
   void slotTrashMsg();   // move to trash