sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benjamin Berg 2007-09-22 00:13:42 +02:00
commit 30d6361fb4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/sugar-install-bundle
View File

@ -1,12 +1,12 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
from sugar.activity.bundle import Bundle from sugar.bundle.activitybundle import ActivityBundle
from dbus.mainloop.glib import DBusGMainLoop from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True) DBusGMainLoop(set_as_default=True)
bundle = Bundle(sys.argv[1]) bundle = ActivityBundle(sys.argv[1])
bundle.install() bundle.install()
print "%s: '%s' installed." % (sys.argv[0], sys.argv[1]) print "%s: '%s' installed." % (sys.argv[0], sys.argv[1])

2
sugar/activity/activityfactory.py
View File

@ -152,7 +152,7 @@ class ActivityCreationHandler(gobject.GObject):
_RAINBOW_ACTIVITY_FACTORY_PATH) _RAINBOW_ACTIVITY_FACTORY_PATH)
factory.CreateActivity( factory.CreateActivity(
self._service_name, self._service_name,
self._activity_handle.get_dict(), self._handle.get_dict(),
timeout=120 * 1000, timeout=120 * 1000,
reply_handler=self._create_reply_handler, reply_handler=self._create_reply_handler,
error_handler=self._create_error_handler, error_handler=self._create_error_handler,