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

List:       kde-commits
Subject:    make_it_cool: kdenetwork/kmail
From:       Don Sanders <don () sanders ! org>
Date:       2003-01-13 8:29:02
[Download RAW message or body]

CVS commit by sanders: 

Update total count in folder tree correctly after messages are deleted.


  M +9 -5      kmfolder.cpp   1.226.2.37
  M +2 -1      kmfolder.h   1.91.2.24
  M +2 -2      kmfoldertree.cpp   1.199.2.29


--- kdenetwork/kmail/kmfolder.h  #1.91.2.23:1.91.2.24
@@ -451,6 +451,7 @@ signals:
   void msgRemoved(KMFolder*, Q_UINT32 sernum);
 
-  /** Emitted when a message is removed from the folder. */
+  /** Emitted after a message is removed from the folder. */
   void msgRemoved(int idx,QString msgIdMD5);
+  void msgRemoved(KMFolder*);
 
   /** Emitted when a message is added from the folder. */

--- kdenetwork/kmail/kmfoldertree.cpp  #1.199.2.28:1.199.2.29
@@ -503,7 +503,7 @@ void KMFolderTree::reload(bool openFolde
               this,SLOT(slotUpdateCounts(KMFolder*)));
         }
-        disconnect(fti->folder(), SIGNAL(msgRemoved(KMFolder*,Q_UINT32)),
+        disconnect(fti->folder(), SIGNAL(msgRemoved(KMFolder*)),
             this,SLOT(slotUpdateCounts(KMFolder*)));
-        connect(fti->folder(), SIGNAL(msgRemoved(KMFolder*,Q_UINT32)),
+        connect(fti->folder(), SIGNAL(msgRemoved(KMFolder*)),
             this,SLOT(slotUpdateCounts(KMFolder*)));
       }

--- kdenetwork/kmail/kmfolder.cpp  #1.226.2.36:1.226.2.37
@@ -397,8 +397,10 @@ void KMFolder::removeMsg(int idx, bool)
   --mTotalMsgs;
 
-  if (!mQuiet)
+  if (!mQuiet) {
     emit msgRemoved(idx, msgIdMD5);
-  else
+    emit msgRemoved(this);
+  } else {
     mChanged = TRUE;
+  }
 }
 
@@ -431,8 +433,10 @@ KMMessage* KMFolder::take(int idx)
   setDirty( true );
   needsCompact=true; // message is taken from here - needs to be compacted
-  if (!mQuiet)
-    emit msgRemoved(idx,msgIdMD5);
-  else
+  if (!mQuiet) {
+    emit msgRemoved(idx, msgIdMD5);
+    emit msgRemoved(this);
+  } else {
     mChanged = TRUE;
+  }
 
   return msg;


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