diff options
Diffstat (limited to 'src/view/Shell.py')
| -rw-r--r-- | src/view/Shell.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/view/Shell.py b/src/view/Shell.py index 2584043..bfaa72e 100644 --- a/src/view/Shell.py +++ b/src/view/Shell.py @@ -93,14 +93,19 @@ class Shell(gobject.GObject): self.start_activity('org.laptop.JournalActivity') def __launch_started_cb(self, home_model, home_activity): - if home_activity.get_type() != 'org.laptop.JournalActivity': - launch_window = LaunchWindow(home_activity) - launch_window.show() + if home_activity.is_journal(): + return + + launch_window = LaunchWindow(home_activity) + launch_window.show() - self._launchers[home_activity.get_activity_id()] = launch_window - self._model.set_zoom_level(shellmodel.ShellModel.ZOOM_ACTIVITY) + self._launchers[home_activity.get_activity_id()] = launch_window + self._model.set_zoom_level(shellmodel.ShellModel.ZOOM_ACTIVITY) def __launch_failed_cb(self, home_model, home_activity): + if home_activity.is_journal(): + return + activity_id = home_activity.get_activity_id() launch_window = self._launchers[activity_id] @@ -113,6 +118,9 @@ class Shell(gobject.GObject): activity_host = ActivityHost(home_activity) self._hosts[activity_host.get_xid()] = activity_host + if home_activity.is_journal(): + return + activity_id = home_activity.get_activity_id() launch_window = self._launchers[activity_id] if launch_window: @@ -218,7 +226,7 @@ class Shell(gobject.GObject): home_model = self._model.get_home() active_activity = home_model.get_active_activity() - if active_activity.get_type() == 'org.laptop.JournalActivity': + if active_activity.is_journal(): return self.take_activity_screenshot() |