diff options
| -rw-r--r-- | bin/sugar-control-panel | 6 | ||||
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 14 | ||||
| -rw-r--r-- | src/jarabe/model/shell.py | 5 |
3 files changed, 14 insertions, 11 deletions
diff --git a/bin/sugar-control-panel b/bin/sugar-control-panel index d72e31a..a97e3c0 100644 --- a/bin/sugar-control-panel +++ b/bin/sugar-control-panel @@ -15,6 +15,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import sys + +from jarabe import config + +sys.path.append(config.ext_path) + from jarabe.controlpanel.cmd import main main() 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(): |