sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-10-19 16:12:55 +02:00
parent 62659e2806
commit 36e535a29a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shell/model/MeshModel.py
View File

@ -86,7 +86,11 @@ class MeshModel(gobject.GObject):
if cur_activity == None: if cur_activity == None:
self.emit('buddy-moved', buddy_model, None) self.emit('buddy-moved', buddy_model, None)
elif self._activities.has_key(cur_activity.get_id()): else:
self._notify_buddy_change(buddy_model, cur_activity)
def _notify_buddy_change(self, buddy_model, cur_activity):
if self._activities.has_key(cur_activity.get_id()):
activity_model = self._activities[cur_activity.get_id()] activity_model = self._activities[cur_activity.get_id()]
self.emit('buddy-moved', buddy_model, activity_model) self.emit('buddy-moved', buddy_model, activity_model)
@ -97,6 +101,10 @@ class MeshModel(gobject.GObject):
self._buddies[model.get_name()] = model self._buddies[model.get_name()] = model
self.emit('buddy-added', model) self.emit('buddy-added', model)
cur_activity = buddy.get_current_activity()
if cur_activity:
self._notify_buddy_change(model, cur_activity)
def _buddy_disappeared_cb(self, pservice, buddy): def _buddy_disappeared_cb(self, pservice, buddy):
self.emit('buddy-removed', buddy) self.emit('buddy-removed', buddy)
del self._buddies[buddy.get_name()] del self._buddies[buddy.get_name()]
@ -123,8 +131,9 @@ class MeshModel(gobject.GObject):
for buddy in self._pservice.get_buddies(): for buddy in self._pservice.get_buddies():
cur_activity = buddy.get_current_activity() cur_activity = buddy.get_current_activity()
if cur_activity == activity: name = buddy.get_name()
buddy_model = self._buddies[buddy.get_name()] if cur_activity == activity and self._buddies.has_key(name):
buddy_model = self._buddies[name]
self.emit('buddy-moved', buddy, model) self.emit('buddy-moved', buddy, model)
def _activity_disappeared_cb(self, pservice, activity): def _activity_disappeared_cb(self, pservice, activity):