diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-22 16:05:14 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-22 16:05:14 (GMT) |
| commit | edeb87905812248ae93aa8f47d0afa888227f77e (patch) | |
| tree | 692a1d833714d760a3844fd17a8afb7c4457fa6e /src | |
| parent | 51eb47d2c0f7b7896e3a8c0ea1e2999d754af8cc (diff) | |
| parent | 96501d38f42c0c0f7e728d682f3fc4798965814f (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 14 | ||||
| -rw-r--r-- | src/jarabe/model/shell.py | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 4c840dd..855c4b6 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -283,17 +283,11 @@ class FavoritesView(hippo.Canvas): self._layout = LAYOUT_MAP[layout]() self._box.set_layout(self._layout) - - #TODO: compatibility hack while sort() gets added to the hippo - # python bindings + + #TODO: compatibility hack while sort() gets added to the hippo python + # bindings if hasattr(self._box, 'sort'): self._box.sort(self._layout.compare_activities) - else: - icons = self._box.get_children() - self._box.clear() - for icon in icons: - self._box.insert_sorted( - icon, 0, self._layout.compare_activities) for icon in self._box.get_children(): if icon not in [self._my_icon, self._current_activity]: @@ -435,7 +429,7 @@ class CurrentActivityIcon(CanvasIcon, hippo.CanvasItem): self.palette = None def create_palette(self): - if home_activity.is_journal(): + if self._home_activity.is_journal(): palette = JournalPalette(self._home_activity) else: palette = CurrentActivityPalette(self._home_activity) diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 64f5e09..4f00852 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -205,7 +205,10 @@ class Activity(gobject.GObject): def get_bundle_path(self): """Returns the activity's bundle directory""" - return self._activity_info.get_path() + if self._activity_info is None: + return None + else: + return self._activity_info.get_path() def equals(self, activity): if self._activity_id and activity.get_activity_id(): |