Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tutorius/TProbe.py
diff options
context:
space:
mode:
Diffstat (limited to 'tutorius/TProbe.py')
-rw-r--r--tutorius/TProbe.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
index 5508d49..7f717f1 100644
--- a/tutorius/TProbe.py
+++ b/tutorius/TProbe.py
@@ -759,13 +759,21 @@ class ProbeManager(object):
self._current_activity = activity_id
def getCurrentActivity(self):
+ if self._current_activity == "org.laptop.JournalActivity":
+ return self._current_activity
# TODO : Insert the correct call to remember the current activity,
# taking the views and frame into account
current_act = get_model().get_active_activity()
- current_act_bundle = ActivityBundle(current_act.get_bundle_path())
- current_act_id = current_act_bundle.get_bundle_id()
- self._current_activity = current_act_id
- return self._current_activity
+ bundle_path = current_act.get_bundle_path()
+ if bundle_path:
+ current_act_bundle = ActivityBundle(bundle_path)
+ current_act_id = current_act_bundle.get_bundle_id()
+ self._current_activity = current_act_id
+ return self._current_activity
+ else:
+ # Temp hack for Journal
+ self._current_activity = 'org.laptop.JournalActivity'#current_act.get_bundle_id()
+ return self._current_activity
currentActivity = property(fget=getCurrentActivity, fset=setCurrentActivity)