/head: changeset 55

Fixed the deleted message caching.

head/offlineimap/folder/Base.py

@@ -185,9 +185,9 @@ class BaseFolder:
             if not uid in self.getmessagelist():
                 deletelist.append(uid)
         if len(deletelist):
-            __main__.ui.deletingmessages(uidlist, applyto)
+            __main__.ui.deletingmessages(deletelist, applyto)
             for object in applyto:
-                object.deletemessages(uidlist)
+                object.deletemessages(deletelist)
 
     def syncmessagesto_flags(self, dest, applyto):
         """Pass 4 of folder synchronization.

head/offlineimap/folder/IMAP.py

@@ -112,13 +112,14 @@ class IMAPFolder(BaseFolder):
         for result in r:
             resultcount += 1
             flags = imaputil.flags2hash(imaputil.imapsplit(result)[1])['FLAGS']
+            uid = long(imaputil.flags2hash(imaputil.imapsplit(result)[1])['UID'])
             self.messagelist[uid]['flags'] = imaputil.flagsimap2maildir(flags)
         assert resultcount == len(uidlist), "Got incorrect number of results back"
 
     def deletemessage(self, uid):
         self.deletemessages([uid])
 
-    def deletemessage(self, uidlist):
+    def deletemessages(self, uidlist):
         # Weed out ones not in self.messagelist
         uidlist = [uid for uid in uidlist if uid in self.messagelist]
         if not len(uidlist):

head/offlineimap/version.py

@@ -1,5 +1,5 @@
 productname = 'OfflineIMAP'
-versionstr = "1.0.2"
+versionstr = "1.0.4"
 
 versionlist = versionstr.split(".")
 major = versionlist[0]