]> code.delx.au - offlineimap/blobdiff - offlineimap/folder/Base.py
Update FSF address
[offlineimap] / offlineimap / folder / Base.py
index 8d1bbae821ac51e6487a5b03dfed96e5cf2e4440..0ee1412ff23fad089d887bf609069115fe4351a7 100644 (file)
@@ -14,7 +14,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from threading import *
 from offlineimap import threadutil
@@ -288,10 +288,11 @@ class BaseFolder:
         them to dest."""
         threads = []
         
+       dest_messagelist = dest.getmessagelist()
         for uid in self.getmessagelist().keys():
             if uid < 0:                 # Ignore messages that pass 1 missed.
                 continue
-            if not uid in dest.getmessagelist():
+            if not uid in dest_messagelist:
                 if self.suggeststhreads():
                     self.waitforthread()
                     thread = InstanceLimitedThread(\
@@ -314,10 +315,11 @@ class BaseFolder:
         Look for message present in dest but not in self.
         If any, delete them."""
         deletelist = []
+       self_messagelist = self.getmessagelist()
         for uid in dest.getmessagelist().keys():
             if uid < 0:
                 continue
-            if not uid in self.getmessagelist():
+            if not uid in self_messagelist:
                 deletelist.append(uid)
         if len(deletelist):
             UIBase.getglobalui().deletingmessages(deletelist, applyto)