diff options
| author | Benjamin Berg <benjamin@sipsolutions.net> | 2007-09-21 22:13:42 (GMT) |
|---|---|---|
| committer | Benjamin Berg <benjamin@sipsolutions.net> | 2007-09-21 22:13:42 (GMT) |
| commit | 30d6361fb45881f94a9b07555d03a1cf9038afad (patch) | |
| tree | cc376232991821cea6b462c410595d0b31fe6389 | |
| parent | c1894d3ec456e4e36efa62169e9445da9f1dc0e8 (diff) | |
| parent | 46357bdc66be5b03aae983e86411a5422fd8007d (diff) | |
Merge branch 'master' of git://dev.laptop.org/sugar
| -rwxr-xr-x | bin/sugar-install-bundle | 4 | ||||
| -rw-r--r-- | sugar/activity/activityfactory.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/sugar-install-bundle b/bin/sugar-install-bundle index 3cce4cb..ce28977 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]) diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index 76c76b2..1041747 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, |