Remove leftover code

1 files changed, 1 insertions, 119 deletions

diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index fe7af88..9789bbf 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -211,129 +211,11 @@ class Neighborhood(gobject.GObject):
             local_pending, remote_pending, actor, reason):
         self._add_handles(connection, added)
 
-        """
-        self._activities = {}
-        self._buddies = {}
-        self._buddies[None] = OwnerBuddyModel()
-
-        self._pservice = presenceservice.get_instance()
-        self._pservice.connect("activity-appeared",
-                               self._activity_appeared_cb)
-        self._pservice.connect('activity-disappeared',
-                               self._activity_disappeared_cb)
-        self._pservice.connect("buddy-appeared",
-                               self._buddy_appeared_cb)
-        self._pservice.connect("buddy-disappeared",
-                               self._buddy_disappeared_cb)
-
-        # Add any buddies the PS knows about already
-        self._pservice.get_buddies_async(reply_handler=self._get_buddies_cb)
-
-        self._pservice.get_activities_async(
-                reply_handler=self._get_activities_cb)
-
-        self._conn_watcher = connection_watcher.ConnectionWatcher()
-        self._conn_watcher.connect('connection-added', self.__conn_addded_cb)
-
-        for conn in self._conn_watcher.get_connections():
-            self.__conn_addded_cb(self._conn_watcher, conn)
-
-        gconf_client = gconf.client_get_default()
-        gconf_client.add_dir('/desktop/sugar/collaboration',
-                             gconf.CLIENT_PRELOAD_NONE)
-        gconf_client.notify_add('/desktop/sugar/collaboration/publish_gadget',
-            self.__publish_gadget_changed_cb)
-        """
-
     def __channel_request_failed_cb(self, error, message):
         raise RuntimeError('Couldn\'t retrieve contact list: %s %s', error, message)
 
     def __channel_request_succeeded_cb(self):
-        logging.debug('moooc Successfully ensured a ContactList channel')
-
-    def __conn_addded_cb(self, watcher, conn):
-        if CONN_INTERFACE_GADGET not in conn:
-            return
-
-        conn[CONN_INTERFACE_GADGET].connect_to_signal('GadgetDiscovered',
-                lambda: self._gadget_discovered(conn))
-
-        gadget_discovered = conn[PROPERTIES_IFACE].Get(CONN_INTERFACE_GADGET,
-                'GadgetAvailable')
-        if gadget_discovered:
-            self._gadget_discovered(conn)
-
-    def _gadget_discovered(self, conn):
-        gconf_client = gconf.client_get_default()
-        key = '/desktop/sugar/collaboration/publish_gadget'
-        publish = gconf_client.get_bool(key)
-        logging.debug('Gadget discovered on connection %s.'
-            ' Publish our status: %r', conn.service_name.split('.')[-1],
-                publish)
-        conn[CONN_INTERFACE_GADGET].Publish(publish)
-
-        self._request_random_buddies(conn, NB_RANDOM_BUDDIES)
-        self._request_random_activities(conn, NB_RANDOM_ACTIVITIES)
-
-    def _request_random_buddies(self, conn, nb):
-        logging.debug('Request %d random buddies', nb)
-
-        path, props_ = conn[CONNECTION_INTERFACE_REQUESTS].CreateChannel(
-            { 'org.freedesktop.Telepathy.Channel.ChannelType':
-                'org.laptop.Telepathy.Channel.Type.BuddyView',
-               'org.laptop.Telepathy.Channel.Interface.View.MaxSize': nb
-          })
-
-        view = Channel(conn.service_name, path)
-        view[CHANNEL_INTERFACE].connect_to_signal('Closed',
-            lambda: self.__respawnable_view_closed_cb(
-                lambda: self._request_random_buddies(conn, nb)))
-
-    def _request_random_activities(self, conn, nb):
-        logging.debug('Request %d random activities', nb)
-
-        path, props_ = conn[CONNECTION_INTERFACE_REQUESTS].CreateChannel(
-            { 'org.freedesktop.Telepathy.Channel.ChannelType':
-                'org.laptop.Telepathy.Channel.Type.ActivityView',
-               'org.laptop.Telepathy.Channel.Interface.View.MaxSize': nb
-          })
-
-        view = Channel(conn.service_name, path)
-        view[CHANNEL_INTERFACE].connect_to_signal('Closed',
-                lambda: self.__respawnable_view_closed_cb(
-                    lambda: self._request_random_activities(conn, nb)))
-
-    def __publish_gadget_changed_cb(self, client_, cnxn_id_, entry,
-                                    user_data=None):
-        if entry.value.type == gconf.VALUE_BOOL:
-            publish = entry.value.get_bool()
-
-            for conn in self._conn_watcher.get_connections():
-                if CONN_INTERFACE_GADGET not in conn:
-                    continue
-
-                gadget_discovered = conn[PROPERTIES_IFACE].Get(
-                    CONN_INTERFACE_GADGET, 'GadgetAvailable')
-                if gadget_discovered:
-                    logging.debug("publish_gadget gconf key changed."
-                            " Publish our status on %s: %r" %
-                            (conn.service_name.split('.')[-1], publish))
-                    conn[CONN_INTERFACE_GADGET].Publish(publish)
-
-    def __respawnable_view_closed_cb(self, request_fct):
-        # Views are closed if the Gadget component is restarted. As we always
-        # want to have the random views opened, we re-request them if they are
-        # closed.
-        logging.debug('View closed. Re-request it')
-        request_fct()
-
-    def _get_buddies_cb(self, buddy_list):
-        for buddy in buddy_list:
-            self._buddy_appeared_cb(self._pservice, buddy)
-
-    def _get_activities_cb(self, activity_list):
-        for act in activity_list:
-            self._check_activity(act)
+        logging.debug('Successfully ensured a ContactList channel')
 
     def get_activities(self):
         return self._activities.values()