Merge branch 'ss/fix-getglobalui' into next

This commit is contained in:
Nicolas Sebrecht 2011-02-17 19:03:59 +01:00
commit 24a9fe46bd
2 changed files with 6 additions and 4 deletions

View File

@ -19,6 +19,8 @@ Changes
Bug Fixes Bug Fixes
--------- ---------
* Fix craches for getglobalui().
Pending for the next major release Pending for the next major release
================================== ==================================

View File

@ -293,7 +293,7 @@ class BaseFolder:
except (KeyboardInterrupt): except (KeyboardInterrupt):
raise raise
except: except:
UIBase.getglobalui().warn("ERROR attempting to copy message " + str(uid) \ self.ui.warn("ERROR attempting to copy message " + str(uid) \
+ " for account " + self.getaccountname() + ":" + traceback.format_exc()) + " for account " + self.getaccountname() + ":" + traceback.format_exc())
@ -400,7 +400,7 @@ class BaseFolder:
except (KeyboardInterrupt): except (KeyboardInterrupt):
raise raise
except: except:
UIBase.getglobalui().warn("ERROR attempting to handle negative uids " \ self.ui.warn("ERROR attempting to handle negative uids " \
+ "for account " + self.getaccountname() + ":" + traceback.format_exc()) + "for account " + self.getaccountname() + ":" + traceback.format_exc())
#all threads launched here are in try / except clauses when they copy anyway... #all threads launched here are in try / except clauses when they copy anyway...
@ -411,7 +411,7 @@ class BaseFolder:
except (KeyboardInterrupt): except (KeyboardInterrupt):
raise raise
except: except:
UIBase.getglobalui().warn("ERROR attempting to delete messages " \ self.ui.warn("ERROR attempting to delete messages " \
+ "for account " + self.getaccountname() + ":" + traceback.format_exc()) + "for account " + self.getaccountname() + ":" + traceback.format_exc())
# Now, the message lists should be identical wrt the uids present. # Now, the message lists should be identical wrt the uids present.
@ -423,7 +423,7 @@ class BaseFolder:
except (KeyboardInterrupt): except (KeyboardInterrupt):
raise raise
except: except:
UIBase.getglobalui().warn("ERROR attempting to sync flags " \ self.ui.warn("ERROR attempting to sync flags " \
+ "for account " + self.getaccountname() + ":" + traceback.format_exc()) + "for account " + self.getaccountname() + ":" + traceback.format_exc())