X-Git-Url: https://code.delx.au/offlineimap/blobdiff_plain/8eb0a2f6dc01630492491d9861b7cf2ed1caaf27..f549baa0748a20ad5652d97ff1a76d90148d6b8d:/offlineimap/accounts.py diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index a78dc36..9f224d0 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -145,19 +145,10 @@ class AccountSynchronizationMixin: localrepos = self.localrepos statusrepos = self.statusrepos self.ui.syncfolders(remoterepos, localrepos) - - (remoteignored,remotenew) = remoterepos.syncfoldersto(localrepos,statusrepos) - if len(remotenew): - localrepos.forgetfolders() - - (localignored,localnew) = localrepos.syncfoldersto(remoterepos,statusrepos) - if len(localnew): - remoterepos.forgetfolders() + remoterepos.syncfoldersto(localrepos) folderthreads = [] for remotefolder in remoterepos.getfolders(): - if remotefolder.getvisiblename() in remoteignored: - continue thread = InstanceLimitedThread(\ instancename = 'FOLDER_' + self.remoterepos.getname(), target = syncfolder, @@ -242,14 +233,6 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos, # - if ((statusfolder.isnewfolder()) and - (len(localfolder.getmessagelist()) > 0) and - (len(remotefolder.getmessagelist()) == 0)): - # This is a locally created folder. Copy its contents to the - # remote folder, and to the StatusFolder. - - localfolder.syncmessagesto(statusfolder, [remotefolder, statusfolder]) - if not statusfolder.isnewfolder(): # Delete local copies of remote messages. This way, # if a message's flag is modified locally but it has been