Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

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])

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,