Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--sugar/activity/activityfactory.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e256305..7af32f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* Activity launching now timeout after 120 seconds. (marco)
+
Snapshot 088c7612e3
* Don't follow the cursor when expanding to secondary palette. (marco)
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py
index fe2a8bd..404e5f4 100644
--- a/sugar/activity/activityfactory.py
+++ b/sugar/activity/activityfactory.py
@@ -113,6 +113,7 @@ class ActivityCreationHandler(gobject.GObject):
error_handler=self._notify_launch_error_handler)
self._factory.create(self._activity_handle.get_dict(),
+ timeout=120 * 1000,
reply_handler=self._no_reply_handler,
error_handler=self._create_error_handler)