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

List:       kde-commits
Subject:    kdepim/kmail
From:       Andreas Gungl <a.gungl () gmx ! de>
Date:       2004-04-04 13:52:18
Message-ID: 20040404135218.D531399E8 () office ! kde ! org
[Download RAW message or body]

CVS commit by gungl: 

improve the handling of situations when a folder is removed
which is a target of a File Into filter action,
now those actions are kept and the user is able to fix them


  M +4 -1      kmfilteraction.cpp   1.117
  M +0 -1      kmfoldermgr.cpp   1.97
  M +7 -0      kmkernel.cpp   1.261
  M +1 -0      kmkernel.h   1.96


--- kdepim/kmail/kmfilteraction.cpp  #1.116:1.117
@@ -308,5 +308,8 @@ bool KMFilterActionWithFolder::folderRem
   if ( aFolder == mFolder ) {
     mFolder = aNewFolder;
+    if ( aNewFolder )
     mFolderName = QString::null;
+    else
+      mFolderName = i18n( "<select a folder>" );
     return TRUE;
   } else

--- kdepim/kmail/kmfoldermgr.cpp  #1.96:1.97
@@ -358,5 +358,4 @@ void KMFolderMgr::removeFolderAux(KMFold
     mRemoveOrig = 0;
   }
-  if (kmkernel->filterMgr()) kmkernel->filterMgr()->folderRemoved(aFolder,0);
 }
 

--- kdepim/kmail/kmkernel.cpp  #1.260:1.261
@@ -914,4 +914,6 @@ void KMKernel::init()
 #endif
 
+  connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ), 
+           this, SLOT( slotFolderRemoved(KMFolder*) ) );
 }
 
@@ -1782,3 +1784,8 @@ KMMainWidget *KMKernel::getKMMainWidget(
 }
 
+void KMKernel::slotFolderRemoved( KMFolder * aFolder )
+{
+  if ( the_filterMgr ) the_filterMgr->folderRemoved( aFolder, 0 );
+}
+
 #include "kmkernel.moc"

--- kdepim/kmail/kmkernel.h  #1.95:1.96
@@ -253,4 +253,5 @@ protected slots:
   void cleanupLoop();
   void cleanupProgress();
+  void slotFolderRemoved(KMFolder*);
 
 signals:


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