diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 17:41:08 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 17:41:08 (GMT) |
| commit | 57992d3fb419561a38cc2e84cf68c4b5790203bb (patch) | |
| tree | be8c995d99cd685602c984f44314a676a8064810 /shell | |
| parent | aa71d354b22f50c1f6d4d8fa9353c277fd2374ce (diff) | |
Handle None current activity case
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/model/MeshModel.py | 8 | ||||
| -rw-r--r-- | shell/view/home/MeshGroup.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index 2b47baf..d8b8640 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -67,8 +67,12 @@ class MeshModel(gobject.GObject): def _buddy_activity_changed_cb(self, buddy, cur_activity): buddy_model = self._buddies[buddy.get_name()] - activity_model = self._activities[cur_activity.get_id()] - self.emit('buddy-moved', buddy_model, activity_model) + + if cur_activity == None: + self.emit('buddy-moved', buddy_model, None) + else: + activity_model = self._activities[cur_activity.get_id()] + self.emit('buddy-moved', buddy_model, activity_model) def _buddy_appeared_cb(self, pservice, buddy): model = BuddyModel(buddy=buddy) diff --git a/shell/view/home/MeshGroup.py b/shell/view/home/MeshGroup.py index 689f759..a95605d 100644 --- a/shell/view/home/MeshGroup.py +++ b/shell/view/home/MeshGroup.py @@ -117,7 +117,7 @@ class MeshGroup(goocanvas.Group): self._remove_buddy(buddy_model) if activity_model == None: - self.add_buddy(buddy_model) + self._add_alone_buddy(buddy_model) else: activity = self._activities[activity_model.get_id()] |