From a8193296ddfdc2e311698a0fc75f432def3a53fc Mon Sep 17 00:00:00 2001
From: Reinier Heeres <rwh@rwh.(none)>
Date: Fri, 9 Nov 2007 10:43:24 +0100
Subject: [PATCH] Ctrl-Q does not kill Journal, #4644

---
 shell/view/Shell.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index a7005873..f6362306 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