Merge branch 'master' into next

This commit is contained in:
Nicolas Sebrecht 2011-03-25 18:42:46 +01:00
commit 71d0828cd6
3 changed files with 9 additions and 4 deletions

View File

@ -16,9 +16,14 @@ New Features
Changes
-------
* Increase compatability with Gmail servers which claim to not support
the UIDPLUS extension but in reality do.
Bug Fixes
---------
* Fix hang when using Ctrl+C in some cases.
Pending for the next major release
==================================

View File

@ -265,10 +265,9 @@ class SyncableAccount(Account):
mbnames.write()
localrepos.forgetfolders()
remoterepos.forgetfolders()
finally:
localrepos.holdordropconnections()
remoterepos.holdordropconnections()
finally:
pass
hook = self.getconf('postsynchook', '')
self.callhook(hook)

View File

@ -439,8 +439,9 @@ class IMAPFolder(BaseFolder):
(typ,dat) = imapobj.check()
assert(typ == 'OK')
# get the UID.
if use_uidplus:
# get the new UID. Test for APPENDUID response even if the
# server claims to not support it, as e.g. Gmail does :-(
if use_uidplus or imapobj._get_untagged_response('APPENDUID', True):
# get the new UID from the APPENDUID response, it could look like
# OK [APPENDUID 38505 3955] APPEND completed
# with 38505 bein folder UIDvalidity and 3955 the new UID