From da6a31aa803e71a438cd38c7de8125494ae70e4f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 22 Aug 2007 18:23:20 -0400 Subject: [PATCH] Revert "Notice when (non-sugar) activity factories fail to launch. #1975" This reverts commit d2aba901c3f85e66ba9c5b6b5d506f472552b48b. The change made etoys *always* apparently fail to launch; the problem is with sugar-native-factory, not activityfactory.py --- sugar/activity/activityfactory.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index b1d55eb2..404e5f4c 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._create_reply_handler, + reply_handler=self._no_reply_handler, error_handler=self._create_error_handler) def get_activity_id(self): @@ -137,10 +137,7 @@ class ActivityCreationHandler(gobject.GObject): def _activate_error_handler(self, err): logging.debug("Activity activation request failed %s" % err) - def _create_reply_handler(self, xid=None): - if xid is None: - self._create_error_handler('D-Bus error') - return + def _create_reply_handler(self, xid): logging.debug("Activity created %s (%s)." % (self._activity_handle.activity_id, self._service_name))