Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

shell/model/BuddyModel.py

@@ -26,8 +26,8 @@ class BuddyModel(gobject.GObject):
 		self._pc_handler = None
 		self._dis_handler = None
 		self._bic_handler = None
+		self._cac_handler = None
 
-		self._cur_activity = None
 		self._pservice = PresenceService.get_instance()
 
 		self._buddy = None
@@ -62,8 +62,15 @@ class BuddyModel(gobject.GObject):
 	def get_buddy(self):
 		return self._buddy
 
+	def is_present(self):
+		if self._buddy:
+			return True
+		return False
+
 	def get_current_activity(self):
-		return self._cur_activity
+		if self._buddy:
+			return self._buddy.get_current_activity()
+		return None
 
 	def __update_buddy(self, buddy):
 		if not buddy:
@@ -76,6 +83,7 @@ class BuddyModel(gobject.GObject):
 		self._pc_handler = self._buddy.connect('property-changed', self.__buddy_property_changed_cb)
 		self._dis_handler = self._buddy.connect('disappeared', self.__buddy_disappeared_cb)
 		self._bic_handler = self._buddy.connect('icon-changed', self.__buddy_icon_changed_cb)
+		self._cac_handler = self._buddy.connect('current-activity-changed', self.__buddy_current_activity_changed_cb)
 
 	def __buddy_appeared_cb(self, pservice, buddy):
 		# FIXME: use public key rather than buddy name
@@ -94,12 +102,6 @@ class BuddyModel(gobject.GObject):
 	def __buddy_property_changed_cb(self, buddy, keys):
 		if not self._buddy:
 			return
-
-		# all we care about right now is current activity
-		if 'curact' in keys:
-			curact = self._buddy.get_current_activity()
-			self._cur_activity = self._pservice.get_activity(curact)
-			self.emit('current-activity-changed', self._cur_activity)
 		if 'color' in keys:
 			self.__set_color_from_string(self._buddy.get_color())
 			self.emit('color-changed', self.get_color())
@@ -110,11 +112,18 @@ class BuddyModel(gobject.GObject):
 		self._buddy.disconnect(self._pc_handler)
 		self._buddy.disconnect(self._dis_handler)
 		self._buddy.disconnect(self._bic_handler)
+		self._buddy.disconnect(self._cac_handler)
 		self.__set_color_from_string(_NOT_PRESENT_COLOR)
-		self._cur_activity = None
-		self.emit('current-activity-changed', self._cur_activity)
 		self.emit('disappeared')
 		self._buddy = None
 
 	def __buddy_icon_changed_cb(self, buddy):
 		self.emit('icon-changed')
+
+	def __buddy_current_activity_changed_cb(self, buddy, activity=None):
+		if not self._buddy:
+			return
+		if activity:
+			self.emit('current-activity-changed', activity)
+		else:
+			self.emit('current-activity-changed')

shell/view/BuddyActivityView.py

@@ -24,14 +24,13 @@ class BuddyActivityView(goocanvas.Group):
 		self._activity_icon = IconItem(x=offset_x, y=offset_y, size=48)
 		self._activity_icon_visible = False
 
-		curact = self._buddy.get_current_activity()
-		if curact:
-			self.__buddy_activity_changed_cb(self._buddy, activity=curact)
+		if self._buddy.is_present():
+			self.__buddy_appeared_cb(buddy)
 
 		self._buddy.connect('current-activity-changed', self.__buddy_activity_changed_cb)
-		self._buddy.connect('appeared', self.__buddy_presence_change_cb)
-		self._buddy.connect('disappeared', self.__buddy_presence_change_cb)
-		self._buddy.connect('color-changed', self.__buddy_presence_change_cb)
+		self._buddy.connect('appeared', self.__buddy_appeared_cb)
+		self._buddy.connect('disappeared', self.__buddy_disappeared_cb)
+		self._buddy.connect('color-changed', self.__buddy_color_changed_cb)
 
 	def get_size_request(self):
 		bi_size = self._buddy_icon.props.size
@@ -52,19 +51,34 @@ class BuddyActivityView(goocanvas.Group):
 				return act.get_icon()
 		return None
 
-	def __buddy_activity_changed_cb(self, buddy, activity=None):
-		if not activity:
+	def __remove_activity_icon(self):
+		if self._activity_icon_visible:
 			self.remove_child(self._activity_icon)
 			self._activity_icon_visible = False
+
+	def __buddy_activity_changed_cb(self, buddy, activity=None):
+		if not 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(activity)
 		if name:
 			self._activity_icon.props.icon_name = name
-			self._activity_icon.props.color = self._buddy_icon.props.color
-		if not self._activity_icon_visible:
-			self.add_child(self._activity_icon)
-			self._activity_icon_visible = True
+			self._activity_icon.props.color = buddy.get_color()
+			if not self._activity_icon_visible:
+				self.add_child(self._activity_icon)
+				self._activity_icon_visible = True
+		else:
+			self.__remove_activity_icon()
 
-	def __buddy_presence_change_cb(self, buddy, color=None):		
+	def __buddy_appeared_cb(self, buddy):
+		activity = self._buddy.get_current_activity()
+		self.__buddy_activity_changed_cb(buddy, activity)
+
+	def __buddy_disappeared_cb(self, buddy):
+		self.__buddy_activity_changed_cb(buddy, None)
+
+	def __buddy_color_changed_cb(self, buddy, color):
 		self._activity_icon.props.color = buddy.get_color()