Implement friends removal, lots of cleanups

shell/view/home/FriendsGroup.py

@@ -12,6 +12,7 @@ class FriendsGroup(goocanvas.Group):
 
 		self._shell = shell
 		self._icon_layout = IconLayout(1200, 900)
+		self._friends = {}
 
 		me = MyIcon(100)
 		me.translate(600 - (me.get_property('size') / 2),
@@ -24,11 +25,18 @@ class FriendsGroup(goocanvas.Group):
 			self.add_friend(friend)
 
 		friends.connect('friend-added', self._friend_added_cb)
+		friends.connect('friend-removed', self._friend_removed_cb)
 
-	def add_friend(self, friend):
-		icon = BuddyIcon(self._shell, friend)
+	def add_friend(self, buddy_info):
+		icon = BuddyIcon(self._shell, buddy_info)
 		self.add_child(icon)
 		self._icon_layout.add_icon(icon)
 
-	def _friend_added_cb(self, data_model, friend):
-		self.add_friend(friend)
+		self._friends[buddy_info.get_name()] = icon
+
+	def _friend_added_cb(self, data_model, buddy_info):
+		self.add_friend(buddy_info)
+
+	def _friend_removed_cb(self, data_model, name):
+		self.remove_child(self._friends[name])
+		del self._friends[name]

shell/view/home/HomeWindow.py

@@ -25,7 +25,7 @@ class HomeWindow(gtk.Window):
 
 		self._add_page(HomeGroup(shell))
 		self._add_page(FriendsGroup(shell))
-		self._add_page(MeshGroup())
+		self._add_page(MeshGroup(shell))
 
 	def _add_page(self, group):
 		view = CanvasView()

shell/view/home/MeshGroup.py

@@ -32,8 +32,11 @@ class ActivityItem(IconItem):
 		return self._service
 
 class MeshGroup(goocanvas.Group):
-	def __init__(self):
+	def __init__(self, shell):
 		goocanvas.Group.__init__(self)
+
+		self._shell = shell
+
 		self._icon_layout = IconLayout(1200, 900)
 		self._activities = {}