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

List:       kde-commits
Subject:    kdepim/kmail
From:       Till Adam <till () adam-lilienthal ! de>
Date:       2003-04-23 16:44:54
[Download RAW message or body]

CVS commit by tilladam: 

Implement compact() as expunge() for imap folders instead of special casing 
on protocol in kmmainwidget.cpp


  M +2 -0      kmfolderimap.h   1.43
  M +4 -18     kmmainwidget.cpp   1.47


--- kdepim/kmail/kmfolderimap.h  #1.42:1.43
@@ -168,4 +168,6 @@ public:
   void expungeFolder(KMFolderImap * aFolder, bool quiet);
 
+  int compact() { expungeFolder(this, false); return 0; };
+  
   /**
    * Emit the folderComplete signal

--- kdepim/kmail/kmmainwidget.cpp  #1.46:1.47
@@ -1088,16 +1088,8 @@ void KMMainWidget::slotCompactFolder()
   if (mFolder)
   {
-    if (mFolder->protocol() == "imap")
-    {
-      KMFolderImap *imap = static_cast<KMFolderImap*>(mFolder);
-      imap->expungeFolder(imap, FALSE);
-    }
-    else
-    {
       kernel->kbp()->busy();
       mFolder->compact();
       kernel->kbp()->idle();
     }
-  }
   mHeaders->setCurrentItemByIndex(idx);
 }
@@ -1149,10 +1141,4 @@ void KMMainWidget::slotCompactAll()
     folder = *folders.at(i);
     if (!folder || folder->isDir()) continue;
-    if (folder->protocol() == "imap")
-    {
-      KMFolderImap *imap = static_cast<KMFolderImap*>(folder);
-      imap->expungeFolder(imap, TRUE);
-    }
-    else
       folder->compact();
   }


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