diff options
author | Reinier Heeres <rwh@rwh.(none)> | 2007-11-09 09:43:24 (GMT) |
---|---|---|
committer | Reinier Heeres <rwh@rwh.(none)> | 2007-11-09 09:43:24 (GMT) |
commit | a8193296ddfdc2e311698a0fc75f432def3a53fc (patch) | |
tree | 74f8ccf1ee7a483254b55d4f772c4336d23073ae /shell | |
parent | ef3fe93985c3232d44781150bdf58cefe3c382bd (diff) |
Ctrl-Q does not kill Journal, #4644
Diffstat (limited to 'shell')
-rw-r--r-- | shell/view/Shell.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py index a700587..f636230 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -222,9 +222,16 @@ class Shell(gobject.GObject): activity.get_window().activate(1) def close_current_activity(self): + if self._model.get_zoom_level() != ShellModel.ZOOM_ACTIVITY: + return + + home_model = self._model.get_home() + activity = home_model.get_active_activity() + if activity.get_type() == 'org.laptop.JournalActivity': + return + self.take_activity_screenshot() - if self._model.get_zoom_level() == ShellModel.ZOOM_ACTIVITY: - self.get_current_activity().close() + self.get_current_activity().close() def get_current_activity(self): return self._current_host |