[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kmail
From:       David Faure <faure () kde ! org>
Date:       2004-11-23 21:47:52
Message-ID: 20041123214752.8670C18EA7 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Forward port fix for #92918 - "Folder Menu not updated after enabling Expiration for a Folder"


  M +13 -17    kmfoldertree.cpp   1.336
  M +12 -1     kmmainwidget.cpp   1.299
  M +2 -0      kmmainwidget.h   1.86


--- kdepim/kmail/kmfoldertree.cpp  #1.335:1.336
@@ -243,11 +243,7 @@ void KMFolderTreeItem::properties()
     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
 }
 

--- kdepim/kmail/kmmainwidget.cpp  #1.298:1.299
@@ -924,5 +924,16 @@ void KMMainWidget::slotModifyFolder()
   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( folder, folder->parent(), folderTree,
+                        i18n("Properties of Folder %1").arg( folder->label() ) );
+  props.exec();
+  updateFolderMenu();
 }
 

--- kdepim/kmail/kmmainwidget.h  #1.85:1.86
@@ -147,4 +147,6 @@ public:
 
 
+  void modifyFolder( KMFolderTreeItem* folderItem );
+
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);


[prev in list] [next in list] [prev in thread] [next in thread]