From 30d6361fb45881f94a9b07555d03a1cf9038afad Mon Sep 17 00:00:00 2001
From: Benjamin Berg <benjamin@sipsolutions.net>
Date: Fri, 21 Sep 2007 22:13:42 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/sugar

---
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,
--
cgit v0.9.1