Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/activity/activityfactory.py
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-09-27 18:53:41 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-09-27 18:53:41 (GMT)
commite543eada4e3d69d69ccaf16fb01d5afc712938e5 (patch)
tree838c34ccd3f8b782c66407af62e55660aacc1ad4 /sugar/activity/activityfactory.py
parent7391e4a3c3b24045802191bf83abed405b02cfc6 (diff)
Revert "Adapt to dbus-python API change"
This reverts commit 7391e4a3c3b24045802191bf83abed405b02cfc6.
Diffstat (limited to 'sugar/activity/activityfactory.py')
-rw-r--r--sugar/activity/activityfactory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py
index 967d10d..1041747 100644
--- a/sugar/activity/activityfactory.py
+++ b/sugar/activity/activityfactory.py
@@ -143,7 +143,7 @@ class ActivityCreationHandler(gobject.GObject):
if not os.path.exists('/etc/olpc-security'):
handle = self._handle.get_dict()
self._factory.create(dbus.Dictionary(handle, signature='ss'),
- timeout=120,
+ timeout=120 * 1000,
reply_handler=self._no_reply_handler,
error_handler=self._create_error_handler)
else:
@@ -153,7 +153,7 @@ class ActivityCreationHandler(gobject.GObject):
factory.CreateActivity(
self._service_name,
self._handle.get_dict(),
- timeout=120,
+ timeout=120 * 1000,
reply_handler=self._create_reply_handler,
error_handler=self._create_error_handler,
dbus_interface=_RAINBOW_ACTIVITY_FACTORY_INTERFACE)