Ticket #142: ps_reconnect.patch

extensions/cpsection/network/model.py

@@ -121 +121 @@
     client = gconf.client_get_default()
     client.set_bool('/desktop/sugar/collaboration/publish_gadget', value)
     return 0
+
+def restart_jabber():
+    """Call Sugar Presence Service to restart Telepathy CMs.
+
+    This allows restarting the jabber server connection when we change it.
+    """
+    _PS_SERVICE = "org.laptop.Sugar.Presence"
+    _PS_INTERFACE = "org.laptop.Sugar.Presence"
+    _PS_PATH = "/org/laptop/Sugar/Presence"
+    bus = dbus.SessionBus()
+    try:
+        ps = dbus.Interface(bus.get_object(_PS_SERVICE, _PS_PATH), _PS_INTERFACE)
+    except dbus.DBusException:
+        raise ReadError('%s service not available', _PS_SERVICE)
+    ps.RestartServerConnection()

extensions/cpsection/network/view.py

@@ -221 +221 @@
         self._jabber_sid = 0
         if widget.get_text() == self._model.get_jabber:
             return
+        self._model.set_jabber(widget.get_text())
         try:
-            self._model.set_jabber(widget.get_text())
-        except ValueError, detail:
+            self._model.restart_jabber()
+        except ReadError, detail:
             self._jabber_alert.props.msg = detail
             self._jabber_valid = False
+            self._jabber_alert.show()
+            self.restart_alerts.append('jabber')
         else:
-            self._jabber_alert.props.msg = self.restart_msg
             self._jabber_valid = True            
-            self.needs_restart = True
-            self.restart_alerts.append('jabber')            
+            self._jabber_alert.hide()
 
         self._validate()
-        self._jabber_alert.show()        
         return False
 
     def __network_configuration_reset_cb(self, widget):