From ff2c88680481bd16f0906a08a04500ccd217ce80 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Tue, 17 Aug 2010 06:56:22 +0000
Subject: Address several nitpicks from Marco

---
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 088a847..bb85024 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -612,7 +612,7 @@ class OwnerIcon(BuddyIcon):
             return
 
         presence_service = presenceservice.get_instance()
-        palette = BuddyMenu(get_owner_instance())
+        palette = BuddyMenu(self.buddy)
 
         client = gconf.client_get_default()
         backup_url = client.get_string('/desktop/sugar/backup_url')
diff --git a/src/jarabe/desktop/friendview.py b/src/jarabe/desktop/friendview.py
index c96cd52..c3faef8 100644
--- a/src/jarabe/desktop/friendview.py
+++ b/src/jarabe/desktop/friendview.py
@@ -62,13 +62,13 @@ class FriendView(hippo.CanvasBox):
 
     def _update_activity(self):
         if not self._buddy.props.present or \
-                not self._buddy.props.current_activity:
+           not self._buddy.props.current_activity:
             self._remove_activity_icon()
             return
 
         # FIXME: use some sort of "unknown activity" icon rather
         # than hiding the icon?
-        name = self._get_new_icon_name(self._buddy.props.current_activity)
+        name = self._get_new_icon_name(self._buddy.current_activity)
         if name:
             self._activity_icon.props.file_name = name
             self._activity_icon.props.xo_color = self._buddy.props.color
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index dd42467..9a1a9da 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -293,6 +293,7 @@ class ActivitiesTray(HTray):
         item.connect('clicked', self.__invite_clicked_cb, invite)
         self.add_item(item)
         item.show()
+
         self._invite_to_item[invite] = item
 
     def _remove_invite(self, invite):
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 3a17ba2..90531a6 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -198,6 +198,7 @@ class _Account(gobject.GObject):
         logging.debug('_Account.__got_connection_cb %r', connection_path)
 
         if connection_path == '/':
+            # Account has no connection, wait until it has one.
             return
 
         self._prepare_connection(connection_path)
@@ -543,7 +544,6 @@ class _Account(gobject.GObject):
     def enable(self):
         logging.debug('_Account.enable %s', self.object_path)
         self._set_enabled(True)
-        #self._start_listening()
 
     def disable(self):
         logging.debug('_Account.disable %s', self.object_path)
--
cgit v0.9.1