Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/model
diff options
context:
space:
mode:
authorMarco 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)
commitedeb87905812248ae93aa8f47d0afa888227f77e (patch)
tree692a1d833714d760a3844fd17a8afb7c4457fa6e /src/jarabe/model
parent51eb47d2c0f7b7896e3a8c0ea1e2999d754af8cc (diff)
parent96501d38f42c0c0f7e728d682f3fc4798965814f (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'src/jarabe/model')
-rw-r--r--src/jarabe/model/shell.py5
1 files changed, 4 insertions, 1 deletions
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():