Gwibber

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

  1. dead-to-races
  2. Merge into gwibber-1.2
Proposed by Alexander Sack
Status: Merged
Merged at revision: not available
Proposed branch: lp:~asac/gwibber/dead-to-races
Merge into: lp:gwibber/1.2
Diff against target: None lines
To merge this branch: bzr merge lp:~asac/gwibber/dead-to-races
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+8572@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

fix some threading issues by using idle handlers :).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1116 self.indicator_items[msg.gId] = indicator1116 self.indicator_items[msg.gId] = indicator
1117 indicator.show()1117 indicator.show()
11181118
1119 def update_view_contents(self, view):1119 def update_view_contents(self, view, indicate, tab):
1120 view.load_messages()1120 view.load_messages()
1121 if indicate and hasattr(view, "add_indicator") and view.add_indicator:
1122 self.manage_indicator_items(view.message_store, tab_num=self.tabs.page_num(tab))
1123 if tab.show_notifications: self.show_notification_bubbles(view.message_store)
1124
1125 def status_bar_update_finished(self, next_update):
1126 self.statusbar.pop(0)
1127 self.statusbar.push(0, _("Last update: %s") % time.strftime("%X"))
1128 self.last_update = next_update
11211129
1122 def update(self, tabs = None):1130 def update(self, tabs = None):
1123 self.throbber.set_from_animation(1131 self.throbber.set_from_animation(
@@ -1138,17 +1146,10 @@
1138 and m.time <= mx.DateTime.gmt()]1146 and m.time <= mx.DateTime.gmt()]
1139 self.flag_duplicates(view.message_store)1147 self.flag_duplicates(view.message_store)
1140 gtk.gdk.threads_enter()1148 gtk.gdk.threads_enter()
1141 gobject.idle_add(self.update_view_contents, view)1149 gobject.idle_add(self.update_view_contents, view, indicate, tab)
1142
1143 if indicate and hasattr(view, "add_indicator") and view.add_indicator:
1144 self.manage_indicator_items(view.message_store, tab_num=self.tabs.page_num(tab))
1145
1146 gtk.gdk.threads_leave()1150 gtk.gdk.threads_leave()
1147 if tab.show_notifications: self.show_notification_bubbles(view.message_store)
11481151
1149 self.statusbar.pop(0)1152 gobject.idle_add(self.status_bar_update_finished, next_update)
1150 self.statusbar.push(0, _("Last update: %s") % time.strftime("%X"))
1151 self.last_update = next_update
11521153
1153 finally: gobject.idle_add(self.throbber.clear)1154 finally: gobject.idle_add(self.throbber.clear)
11541155

Subscribers

People subscribed via source and target branches