Merge lp:~asac/gwibber/dead-to-races into lp:gwibber/1.2

[Alexander Sack]

[Alexander Sack (asac)]

fix some threading issues by using idle handlers :).

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2009-06-21 01:17:53 +0000
+++ gwibber/client.py	2009-07-10 00:40:29 +0000
@@ -1116,8 +1116,16 @@
           self.indicator_items[msg.gId] = indicator
           indicator.show()
 
-  def update_view_contents(self, view):
+  def update_view_contents(self, view, indicate, tab):
     view.load_messages()
+    if indicate and hasattr(view, "add_indicator") and view.add_indicator:
+      self.manage_indicator_items(view.message_store, tab_num=self.tabs.page_num(tab))
+    if tab.show_notifications: self.show_notification_bubbles(view.message_store)
+
+  def status_bar_update_finished(self, next_update):
+    self.statusbar.pop(0)
+    self.statusbar.push(0, _("Last update: %s") % time.strftime("%X"))
+    self.last_update = next_update
 
   def update(self, tabs = None):
     self.throbber.set_from_animation(
@@ -1138,17 +1146,10 @@
               and m.time <= mx.DateTime.gmt()]
             self.flag_duplicates(view.message_store)
             gtk.gdk.threads_enter()
-            gobject.idle_add(self.update_view_contents, view)
-            
-            if indicate and hasattr(view, "add_indicator") and view.add_indicator:
-              self.manage_indicator_items(view.message_store, tab_num=self.tabs.page_num(tab))
-
+            gobject.idle_add(self.update_view_contents, view, indicate, tab)
             gtk.gdk.threads_leave()
-            if tab.show_notifications: self.show_notification_bubbles(view.message_store)
 
-        self.statusbar.pop(0)
-        self.statusbar.push(0, _("Last update: %s") % time.strftime("%X"))
-        self.last_update = next_update
+        gobject.idle_add(self.status_bar_update_finished, next_update)
 
       finally: gobject.idle_add(self.throbber.clear)