Fix add and remove friends

shell/model/Friends.py

@@ -32,7 +32,7 @@ class Friends(gobject.GObject):
 
 	def make_friend(self, buddy):
 		if not self.has_buddy(buddy):	
-			self.add_friend(BuddyModel(buddy))
+			self.add_friend(BuddyModel(buddy=buddy))
 			self.save()
 
 	def remove(self, buddy_info):

shell/view/BuddyMenu.py

@@ -53,10 +53,10 @@ class BuddyMenu(Menu):
 
 		friends = shell_model.get_friends()
 		if friends.has_buddy(self._buddy):
-			icon = IconItem(icon_name='stock-add')
+			icon = IconItem(icon_name='stock-remove')
 			self.add_action(icon, BuddyMenu.ACTION_REMOVE_FRIEND) 
 		else:
-			icon = IconItem(icon_name='stock-remove')
+			icon = IconItem(icon_name='stock-add')
 			self.add_action(icon, BuddyMenu.ACTION_MAKE_FRIEND)
 
 		activity_id = shell_model.get_current_activity()