Get sugar-launch back to work.

1 files changed, 10 insertions, 7 deletions

diff --git a/bin/sugar-launch b/bin/sugar-launch
index 7765ff1..68fe613 100644
--- a/bin/sugar-launch
+++ b/bin/sugar-launch
@@ -18,10 +18,11 @@
 
 import os
 import sys
+import dbus
 from optparse import OptionParser
 
 from sugar.activity import activityfactory
-from sugar.activity.registry import get_registry
+from sugar.bundle.activitybundle import ActivityBundle
 
 usage = "usage: %prog [options] activity"
 parser = OptionParser(usage)
@@ -30,15 +31,17 @@ parser.add_option("-d", "--debug", action="store_true", dest="debug",
 (options, args) = parser.parse_args()
 
 if len(args) == 0:
-    print 'You need to specify the activity name or part of it.'
+    print 'You need to specify the activity bundle_id.'
     sys.exit(1)
 
-registry = get_registry()
-activities = registry.find_activity(args[0])
-if len(activities) == 0:
-    print 'Activity not found.'
+bus = dbus.SessionBus()
+proxy = bus.get_object('org.laptop.Shell', '/org/laptop/Shell')
+path = dbus.Interface(proxy, 'org.laptop.Shell').GetBundlePath(args[0])
+if not path:
+    print 'Cannot find %s bundle.' % args[0]
+    sys.exit(1)
 
-activity = activities[0]
+activity = ActivityBundle(path)
 cmd_args = activityfactory.get_command(activity)
 
 def _which(exec_file):