diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 16:55:35 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 16:55:35 (GMT) |
| commit | d63180c4f402f16629006d699004df93ac685179 (patch) | |
| tree | 1d2658662e17d4a6c7efe60e41175e66efeaacfe /shell | |
| parent | 59add6e9011bee1ab0fe9609659e0c5a04e91c6a (diff) | |
Some fixes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/view/home/MeshGroup.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/shell/view/home/MeshGroup.py b/shell/view/home/MeshGroup.py index d85809c..689f759 100644 --- a/shell/view/home/MeshGroup.py +++ b/shell/view/home/MeshGroup.py @@ -74,7 +74,7 @@ class MeshGroup(goocanvas.Group): self._model.connect('activity-removed', self._activity_removed_cb) def _buddy_added_cb(self, model, buddy_model): - self._add_buddy(buddy_model) + self._add_alone_buddy(buddy_model) def _buddy_removed_cb(self, model, buddy_model): self._remove_buddy(buddy_model) @@ -88,7 +88,7 @@ class MeshGroup(goocanvas.Group): def _activity_removed_cb(self, model, activity_model): self._remove_activity(activity_model) - def _add_buddy(self, buddy_model): + def _add_alone_buddy(self, buddy_model): icon = BuddyIcon(self._shell, self._menu_shell, buddy_model) icon.props.size = 80 self.add_child(icon) @@ -96,21 +96,25 @@ class MeshGroup(goocanvas.Group): self._buddies[buddy_model.get_name()] = icon self._layout.add_icon(icon) - def _remove_buddy(self, buddy_model): + def _remove_alone_buddy(self, buddy_model): icon = self._buddies[buddy_model.get_name()] self.remove_child(icon) self._layout.remove_icon(icon) del self._buddies[buddy_model.get_name()] + def _remove_buddy(self, buddy_model): + name = buddy_model.get_name() + if self._buddies.has_key(name): + self._remove_alone_buddy(buddy_model) + else: + for activity in self._activities.values(): + if activity.has_buddy_icon(name): + activity.remove_buddy_icon(name) + def _move_buddy(self, buddy_model, activity_model): name = buddy_model.get_name() - if self._buddies.has_key(name): - self._remove_buddy(buddy_model) - - for activity in self._activities.values(): - if activity.has_buddy_icon(name): - activity.remove_buddy_icon(name) + self._remove_buddy(buddy_model) if activity_model == None: self.add_buddy(buddy_model) |