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

Fix shell for sugar.presence.activity API changes

Browse Source
This commit is contained in:
Dan Williams 2007-04-27 12:56:13 -04:00
parent 9537082fc1
commit 16162f74ff
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
shell/model/MeshModel.py
View File

@ -30,13 +30,13 @@ class ActivityModel:
self._bundle = bundle self._bundle = bundle
def get_id(self): def get_id(self):
return self._activity.get_id() return self._activity.props.id
def get_icon_name(self): def get_icon_name(self):
return self._bundle.get_icon() return self._bundle.get_icon()
def get_color(self): def get_color(self):
return XoColor(self._activity.get_color()) return XoColor(self._activity.props.color)
def get_service_name(self): def get_service_name(self):
return self._bundle.get_service_name() return self._bundle.get_service_name()
@ -163,8 +163,8 @@ class MeshModel(gobject.GObject):
def _buddy_activity_changed_cb(self, model, cur_activity): def _buddy_activity_changed_cb(self, model, cur_activity):
if not self._buddies.has_key(model.get_key()): if not self._buddies.has_key(model.get_key()):
return return
if cur_activity and self._activities.has_key(cur_activity.get_id()): if cur_activity and self._activities.has_key(cur_activity.props.id):
activity_model = self._activities[cur_activity.get_id()] activity_model = self._activities[cur_activity.props.id]
self.emit('buddy-moved', model, activity_model) self.emit('buddy-moved', model, activity_model)
else: else:
self.emit('buddy-moved', model, None) self.emit('buddy-moved', model, None)
@ -193,12 +193,10 @@ class MeshModel(gobject.GObject):
self._check_activity(activity) self._check_activity(activity)
def _check_activity(self, activity): def _check_activity(self, activity):
atype = activity.props.type bundle = self._bundle_registry.get_bundle(activity.props.type)
bundle = self._bundle_registry.get_bundle(atype)
if not bundle: if not bundle:
return return
activity_id = activity.get_id() if self.has_activity(activity.props.id):
if self.has_activity(activity_id):
return return
self.add_activity(bundle, activity) self.add_activity(bundle, activity)
@ -224,7 +222,7 @@ class MeshModel(gobject.GObject):
self.emit('buddy-moved', buddy_model, model) self.emit('buddy-moved', buddy_model, model)
def _activity_disappeared_cb(self, pservice, activity): def _activity_disappeared_cb(self, pservice, activity):
if self._activities.has_key(activity.get_id()): if self._activities.has_key(activity.props.id):
activity_model = self._activities[activity.get_id()] activity_model = self._activities[activity.props.id]
self.emit('activity-removed', activity_model) self.emit('activity-removed', activity_model)
del self._activities[activity.get_id()] del self._activities[activity.props.id]