From d2aba901c3f85e66ba9c5b6b5d506f472552b48b Mon Sep 17 00:00:00 2001
From: Dan Winship <dwinship@redhat.com>
Date: Wed, 08 Aug 2007 22:24:11 +0000
Subject: Notice when (non-sugar) activity factories fail to launch. #1975

(still need a better shell UI for when this happens)
---
(limited to 'sugar/activity/activityfactory.py')

diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py
index 404e5f4..b1d55eb 100644
--- a/sugar/activity/activityfactory.py
+++ b/sugar/activity/activityfactory.py
@@ -114,7 +114,7 @@ class ActivityCreationHandler(gobject.GObject):
 
         self._factory.create(self._activity_handle.get_dict(),
                              timeout=120 * 1000,
-                             reply_handler=self._no_reply_handler,
+                             reply_handler=self._create_reply_handler,
                              error_handler=self._create_error_handler)
 
     def get_activity_id(self):
@@ -137,7 +137,10 @@ class ActivityCreationHandler(gobject.GObject):
     def _activate_error_handler(self, err):
         logging.debug("Activity activation request failed %s" % err)
 
-    def _create_reply_handler(self, xid):
+    def _create_reply_handler(self, xid=None):
+        if xid is None:
+            self._create_error_handler('D-Bus error')
+            return
         logging.debug("Activity created %s (%s)." % 
             (self._activity_handle.activity_id, self._service_name))
 
--
cgit v0.9.1