From 6cfae625a38105297028c9c515f48a11f7c40147 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 21 Sep 2007 15:16:53 -0400 Subject: [PATCH 1/2] update sugar-install-bundle for Bundle -> ActivityBundle --- bin/sugar-install-bundle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sugar-install-bundle b/bin/sugar-install-bundle index 3cce4cb1..ce289775 100755 --- a/bin/sugar-install-bundle +++ b/bin/sugar-install-bundle @@ -1,12 +1,12 @@ #!/usr/bin/env python import sys -from sugar.activity.bundle import Bundle +from sugar.bundle.activitybundle import ActivityBundle from dbus.mainloop.glib import DBusGMainLoop DBusGMainLoop(set_as_default=True) -bundle = Bundle(sys.argv[1]) +bundle = ActivityBundle(sys.argv[1]) bundle.install() print "%s: '%s' installed." % (sys.argv[0], sys.argv[1]) From 46357bdc66be5b03aae983e86411a5422fd8007d Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Fri, 21 Sep 2007 17:26:58 -0400 Subject: [PATCH 2/2] Fixes #3723, "Fix Rainbow/Sugar Integration." --- sugar/activity/activityfactory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index 76c76b2d..10417479 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -152,7 +152,7 @@ class ActivityCreationHandler(gobject.GObject): _RAINBOW_ACTIVITY_FACTORY_PATH) factory.CreateActivity( self._service_name, - self._activity_handle.get_dict(), + self._handle.get_dict(), timeout=120 * 1000, reply_handler=self._create_reply_handler, error_handler=self._create_error_handler,