sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Notice when (non-sugar) activity factories fail to launch. #1975"

Browse Source 
This reverts commit d2aba901c3.

The change made etoys *always* apparently fail to launch; the problem
is with sugar-native-factory, not activityfactory.py
This commit is contained in:
Dan Winship 2007-08-22 18:23:20 -04:00
parent 0a18473ca7
commit da6a31aa80
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sugar/activity/activityfactory.py
View File

@ -114,7 +114,7 @@ class ActivityCreationHandler(gobject.GObject):
self._factory.create(self._activity_handle.get_dict(), self._factory.create(self._activity_handle.get_dict(),
timeout=120 * 1000, timeout=120 * 1000,
reply_handler=self._create_reply_handler, reply_handler=self._no_reply_handler,
error_handler=self._create_error_handler) error_handler=self._create_error_handler)
def get_activity_id(self): def get_activity_id(self):
@ -137,10 +137,7 @@ class ActivityCreationHandler(gobject.GObject):
def _activate_error_handler(self, err): def _activate_error_handler(self, err):
logging.debug("Activity activation request failed %s" % err) logging.debug("Activity activation request failed %s" % err)
def _create_reply_handler(self, xid=None): def _create_reply_handler(self, xid):
if xid is None:
self._create_error_handler('D-Bus error')
return
logging.debug("Activity created %s (%s)." % logging.debug("Activity created %s (%s)." %
(self._activity_handle.activity_id, self._service_name)) (self._activity_handle.activity_id, self._service_name))