More cleanups

This commit is contained in:
Marco Pesenti Gritti 2007-04-15 15:28:25 +02:00
parent 5e69406c64
commit 6297f3bdca

View File

@ -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)