Ticket #2967: 0001-Disable-telepathy-plugins-on-sugar-shell-level-2967.patch

src/jarabe/model/neighborhood.py

@@ -14 +14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import os
 import logging
 from functools import partial
 from hashlib import sha1
@@ -192 +193 @@
         self._buddy_handles = {}
         self._activity_handles = {}
         self._self_handle = None
+        self._disabled = False
 
         self._buddies_per_activity = {}
         self._activities_per_buddy = {}
 
-        self._start_listening()
+        cm_name = account_path.split('/')[-3]
+        debug_flags = os.environ.get('PRESENCE_SERVICE_DEBUG', '').split(',')
+        if 'disable-%s' % cm_name in debug_flags:
+            logging.info('%s disabled by PRESENCE_SERVICE_DEBUG', cm_name)
+            self._disabled = True
+        else:
+            self._start_listening()
+
+    def update_parameters(self, parameters):
+        bus = dbus.Bus()
+        account = bus.get_object(ACCOUNT_MANAGER_SERVICE, self.object_path)
+        params_needing_reconnect = account.UpdateParameters(
+                parameters, dbus.Array([], 's'), dbus_interface=ACCOUNT)
+        if not self._disabled and params_needing_reconnect:
+            account.Reconnect()
 
     def _start_listening(self):
         bus = dbus.Bus()
@@ -637 +653 @@
         self._connection = None
 
     def _set_enabled(self, value):
+        if self._disabled:
+            return
+
         bus = dbus.Bus()
         obj = bus.get_object(ACCOUNT_MANAGER_SERVICE, self.object_path)
         obj.Set(ACCOUNT, 'Enabled', value,
@@ -646 +665 @@
                 dbus_interface=dbus.PROPERTIES_IFACE)
 
     def __set_enabled_cb(self):
-        logging.debug('_Account.__set_enabled_cb success')
+        logging.debug('_Account.__set_enabled_cb success %r', self.object_path)
 
 
 class Neighborhood(gobject.GObject):
@@ -819 +838 @@
     def __jabber_server_changed_cb(self, client, timestamp, entry, *extra):
         logging.debug('__jabber_server_changed_cb')
 
-        bus = dbus.Bus()
-        account = bus.get_object(ACCOUNT_MANAGER_SERVICE,
-                                 self._server_account.object_path)
-
-        server = client.get_string(
-            '/desktop/sugar/collaboration/jabber_server')
-        account_id = self._get_jabber_account_id()
-        params_needing_reconnect = account.UpdateParameters(
-            {'server': server,
-             'account': account_id,
-             'register': True},
-            dbus.Array([], 's'), dbus_interface=ACCOUNT)
-        if params_needing_reconnect:
-            account.Reconnect()
-
+        parameters = {
+                'server': client.get_string(
+                    '/desktop/sugar/collaboration/jabber_server'),
+                'account': self._get_jabber_account_id(),
+                'register': True,
+                }
+        self._server_account.update_parameters(parameters)
         self._update_jid()
 
     def __nick_changed_cb(self, client, timestamp, entry, *extra):
@@ -851 +862 @@
                                         self._link_local_account.object_path)
         link_local_obj.Set(ACCOUNT, 'Nickname', nick,
                            dbus_interface=PROPERTIES_IFACE)
-        params_needing_reconnect = link_local_obj.UpdateParameters(
-            {'nickname': nick, 'published-name': self._get_published_name()},
-            dbus.Array([], 's'), dbus_interface=ACCOUNT)
-        if params_needing_reconnect:
-            link_local_obj.Reconnect()
+
+        params = {'nickname': nick,
+                  'published-name': self._get_published_name(),
+                  }
+        self._link_local_account.update_parameters(params)
 
         self._update_jid()
 
     def _update_jid(self):
-        bus = dbus.Bus()
-        account = bus.get_object(ACCOUNT_MANAGER_SERVICE,
-                                 self._link_local_account.object_path)
-
-        account_id = self._get_jabber_account_id()
-        params_needing_reconnect = account.UpdateParameters(
-            {'jid': account_id}, dbus.Array([], 's'), dbus_interface=ACCOUNT)
-        if params_needing_reconnect:
-            account.Reconnect()
+        parameters = {'jid': self._get_jabber_account_id()}
+        self._link_local_account.update_parameters(parameters)
 
     def __buddy_added_cb(self, account, contact_id, nick, handle):
         logging.debug('__buddy_added_cb %r', contact_id)