From 01de8531d06e51a9c540e557faf7dfccbf46e59d Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 01 Oct 2007 14:50:17 +0000
Subject: Make sure the shell service is started up before trying

to open the journal.
---
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index 9d14a2f..3327972 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -67,7 +67,12 @@ class Shell(gobject.GObject):
         gobject.idle_add(self._start_journal_idle)
 
     def _start_journal_idle(self):
-        self.start_activity('org.laptop.JournalActivity')
+        registry = activity.get_registry()
+
+        # Checking for the bundle existence will also ensure
+        # that the shell service is started up.
+        if registry.get_activity('org.laptop.JournalActivity'):
+            self.start_activity('org.laptop.JournalActivity')
 
     def _activity_started_cb(self, home_model, home_activity):
         activity_host = ActivityHost(home_activity)
--
cgit v0.9.1