Merge lp:~ken-vandine/gwibber/gwibber-follow-dbus-name-changes into lp:~gwibber-committers/gwibber/trunk.merge.backup

[Ken VanDine]

[Ken VanDine (ken-vandine)]

This makes both the client and the server follow name changes. Therefore if either restarts the other can still communicate with it. This should make it far more robust.

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2009-09-25 12:57:19 +0000
+++ gwibber/client.py	2009-10-04 16:25:18 +0000
@@ -143,10 +143,14 @@
     self.connect("focus-in-event", self.on_focus)
     self.connect("delete-event", self.on_delete)
 
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     bus = dbus.SessionBus()
-    db_mb_obj = bus.get_object("com.Gwibber", "/com/gwibber/Microblog")
-    db_msg_obj = bus.get_object("com.Gwibber", "/com/gwibber/Messages")
 
+    db_mb_obj = bus.get_object("com.Gwibber", "/com/gwibber/Microblog",
+      follow_name_owner_changes = True, introspect = False)
+    db_msg_obj = bus.get_object("com.Gwibber", "/com/gwibber/Messages",
+      follow_name_owner_changes = True, introspect = False)
+ 
     self.microblog = dbus.Interface(db_mb_obj, "com.Gwibber")
     self.messages = dbus.Interface(db_msg_obj, "com.Gwibber")
     self.messages.connect_to_signal("operations_started", self.on_operation_started)
@@ -154,6 +158,7 @@
     self.messages.connect_to_signal("finish_loading", self.on_finish_loading)
     self.messages.connect_to_signal("error", self.on_error)
 
+
     self.protocols = self.microblog.protocols()
     self.features = self.microblog.features()
 
@@ -187,7 +192,6 @@
         self.apply_ui_element_settings)
 
     self.apply_ui_element_settings()
-    self.register_operations()
 
     # Set the starting path
     # TODO: load the user's path from the previous session
@@ -749,6 +753,7 @@
     return feature in self.protocols[protocol]["features"]
 
   def refresh(self):
+    self.register_operations()
     self.microblog.perform_scheduled_operations()
 
   def register_operations(self):

=== modified file 'gwibber/microblog/__init__.py'
--- gwibber/microblog/__init__.py	2009-09-21 22:12:49 +0000
+++ gwibber/microblog/__init__.py	2009-10-04 16:25:18 +0000
@@ -244,7 +244,10 @@
           del self.scheduled_operations[i]
 
   def perform_scheduled_operations(self):
-    for o in list(self.scheduled_operations.values()):
+    operations = list(self.scheduled_operations.values())
+    if len(operations) == 0:
+      logger.debug("No operations scheduled")
+    for o in operations:
       self.perform_scheduled_operation(o)
 
   def perform_scheduled_operation(self, o):

=== modified file 'gwibber/server.py'
--- gwibber/server.py	2009-09-24 14:03:18 +0000
+++ gwibber/server.py	2009-10-04 16:25:18 +0000
@@ -215,9 +215,12 @@
         self.show_notification_bubble(message)
 
   def on_indicator_activate(self, indicator):
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     client_bus = dbus.SessionBus()
     try:
-      client_obj = client_bus.get_object("com.GwibberClient", "/com/GwibberClient")
+      client_obj = client_bus.get_object("com.GwibberClient",
+        "/com/GwibberClient", follow_name_owner_changes = True,
+        introspect = False)
       gw = dbus.Interface(client_obj, "com.GwibberClient")
       gw.focus_client(reply_handler=self.handle_focus_reply, 
                       error_handler=self.handle_focus_error)