diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-15 13:28:25 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-15 13:28:25 (GMT) |
commit | 6297f3bdca5bba1c1e2fa8a690833826512a9884 (patch) | |
tree | 354ea25cd71ec3b69b5fa36a243c7774e76a378f /sugar-emulator | |
parent | 5e69406c649281c40945ea66cfb24ab13c4a97b2 (diff) |
More cleanups
Diffstat (limited to 'sugar-emulator')
-rwxr-xr-x | sugar-emulator | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sugar-emulator b/sugar-emulator index 6fdfc46..33155ff 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -72,17 +72,19 @@ def _start_xephyr(): os.environ['DISPLAY'] = ":%d" % (display) os.environ['SUGAR_EMULATOR_PID'] = str(pid) -os.environ['SUGAR_EMULATOR'] = 'yes' - -if len(sys.argv) == 1: - program = 'sugar-shell' -else: - program = sys.argv[1] +def _setup_env(): + os.environ['SUGAR_EMULATOR'] = 'yes' +_setup_env() _start_xephyr() from sugar import env os.environ['GTK2_RC_FILES'] = env.get_data_path('gtkrc') +if len(sys.argv) == 1: + program = 'sugar-shell' +else: + program = sys.argv[1] + os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) |