Ticket #1151: presenceservice.patch

telepathy_plugin.py

@@ -154 +154 @@
         self._ip4am_sigid = self._ip4am.connect('address-changed',
                 self._ip4_address_changed_cb)
 
+    def reload_account_info(self):
+        self._account = self._get_account_info()
+
     @property
     def status(self):
         """Return the Telepathy connection status."""

presenceservice.py

@@ -56 +56 @@
         # Overridden by TestPresenceService
         return ShellOwner(self, self._session_bus)
 
+    def _setup_tp(self, tp):
+        self._handles_buddies[tp] = {}
+        self._activities_by_handle[tp] = {}
+
+        tp.connect('status', self._tp_status_cb)
+        tp.connect('contacts-online', self._contacts_online)
+        tp.connect('contacts-offline', self._contacts_offline)
+        tp.connect('activity-invitation',
+                                    self._activity_invitation)
+        tp.connect('private-invitation',
+                                    self._private_invitation)
+        tp.connect('want-to-connect', self._want_to_connect)
+
     def __init__(self):
         self._next_object_id = 0
 
@@ -115 +128 @@
         self._connected_plugins = set()
 
         for tp in self._plugins:
-            self._handles_buddies[tp] = {}
-            self._activities_by_handle[tp] = {}
-
-            tp.connect('status', self._tp_status_cb)
-            tp.connect('contacts-online', self._contacts_online)
-            tp.connect('contacts-offline', self._contacts_offline)
-            tp.connect('activity-invitation',
-                                        self._activity_invitation)
-            tp.connect('private-invitation',
-                                        self._private_invitation)
-            tp.connect('want-to-connect', self._want_to_connect)
+            self._setup_tp(tp)
             tp.start()
 
         self._contacts_online_queue = []
@@ -271 +274 @@
             for match in matches:
                 match.remove()
 
+    @dbus.service.method(PRESENCE_INTERFACE, in_signature="",
+            out_signature="")
+    def RetryConnections(self):
+        """Reload configuration and retry connections on all managers."""
+        self._owner.reload_config()
+        if self._server_plugin is None:
+            server = self._owner.get_server()
+            if server and len(server):
+                tp = ServerPlugin(self._registry, self._owner)
+                self._setup_tp(tp)
+                self._server_plugin = tp
+                self._plugins.append(self._server_plugin)
+
+        for tp in self._plugins:
+            tp.reload_account_info()
+            tp.start()
+
     def get_buddy_by_path(self, path):
         """Get the Buddy object corresponding to an object-path, or None.
 

buddy.py

@@ -984 +984 @@
         # we already know our own nick, color, key
         self._awaiting = None
 
+    def reload_config(self):
+        profile = get_profile()
+        profile.reload()
+        self._server = profile.jabber_server
+
     def _icon_changed_cb(self, icon):
         """Handle icon change, set property to generate event"""
         icon = str(icon)