From 535b67ea41bbe150888f19ac89a7bde99cd86bb6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 16 Oct 2006 23:09:44 +0000
Subject: alt+q shutdown the emulator

---
(limited to 'sugar')

diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
index d6391a9..7593387 100644
--- a/sugar/__uninstalled__.py.in
+++ b/sugar/__uninstalled__.py.in
@@ -17,5 +17,6 @@ sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
 sugar_python_path.append(os.path.join(sugar_source_dir, 'services'))
 
 sugar_bin_path = []
+sugar_bin_path.append(os.path.join(sugar_source_dir))
 sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
 sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence'))
diff --git a/sugar/emulator.py b/sugar/emulator.py
index f1f0b3d..638029e 100644
--- a/sugar/emulator.py
+++ b/sugar/emulator.py
@@ -60,6 +60,7 @@ class Process:
 		flags = gobject.SPAWN_SEARCH_PATH
 		result = gobject.spawn_async(args, flags=flags,
 									 standard_output=standard_output)
+		self.pid = result[0]
 		self._stdout = result[2]
 
 class MatchboxProcess(Process):
@@ -92,6 +93,8 @@ class XephyrProcess(Process):
 	def start(self):
 		Process.start(self)
 		os.environ['DISPLAY'] = ":%d" % (self._display)
+		os.environ['SUGAR_XEPHYR_PID'] = '%d' % self.pid
+
 
 class XnestProcess(Process):
 	def __init__(self):
--
cgit v0.9.1