Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-02-02 11:23:35 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2013-02-02 11:23:35 (GMT)
commit0662060f51998c9ef1c7e23eb6e8d84c87f5e3c8 (patch)
tree45ee70d5cbc59551601d9c5731a21b733f529c6a
parent5ea6472e0d97208649e53ed951dca83692e6b786 (diff)
Pass the activity process pid to NotifyLaunchhtml2
This will be used by the shell to map the windows to their activity_id without requiring custom window properties.
-rw-r--r--src/sugar3/activity/activityfactory.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/sugar3/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py
index d544cd0..53195c8 100644
--- a/src/sugar3/activity/activityfactory.py
+++ b/src/sugar3/activity/activityfactory.py
@@ -211,11 +211,6 @@ class ActivityCreationHandler(GObject.GObject):
if self._handle.activity_id is None:
self._handle.activity_id = create_activity_id()
- self._shell.NotifyLaunch(
- self._service_name, self._handle.activity_id,
- reply_handler=self._no_reply_handler,
- error_handler=self._notify_launch_error_handler)
-
environ = get_environment(self._bundle)
(log_path, log_file) = open_log_file(self._bundle)
command = get_command(self._bundle, self._handle.activity_id,
@@ -258,6 +253,13 @@ class ActivityCreationHandler(GObject.GObject):
stdout=log_file.fileno(),
stderr=log_file.fileno())
+ self._shell.NotifyLaunch(
+ self._service_name,
+ self._handle.activity_id,
+ child.pid,
+ reply_handler=self._no_reply_handler,
+ error_handler=self._notify_launch_error_handler)
+
GObject.child_watch_add(child.pid,
_child_watch_cb,
(environment_dir, log_file,