diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-10 14:16:30 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-10 14:16:30 (GMT) |
| commit | 01da88551614a062b11659bd7f3a7330e5bde59a (patch) | |
| tree | e379d648626b40afbe6d79e74ea589299f0f17be /shell | |
| parent | 3e30af13f6870eeee89b957a0e2e5f419c68ccaf (diff) | |
Lots of build fixes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 17 | ||||
| -rwxr-xr-x | shell/sugar | 13 |
2 files changed, 15 insertions, 15 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 371d245..6410546 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,14 +1,15 @@ -SUBDIRS = google session +SUBDIRS = session bin_SCRIPTS = sugar sugardir = $(pkgdatadir)/shell -sugar_PYTHON = \ - __init__.py \ - shell.py \ - Owner.py \ - PresenceWindow.py \ - StartPage.py \ - WindowManager.py +sugar_PYTHON = \ + __init__.py \ + ActivityRegistry.py \ + ConsoleLogger.py \ + Owner.py \ + HomeWindow.py \ + PresenceWindow.py \ + Shell.py EXTRA_DIST = sugar diff --git a/shell/sugar b/shell/sugar index 9a857db..d352442 100755 --- a/shell/sugar +++ b/shell/sugar @@ -5,8 +5,6 @@ import os import pwd import random -import pygtk -pygtk.require('2.0') import gobject # FIXME How to pick a good display number @@ -15,7 +13,8 @@ XEPHYR_DISPLAY = 100 def add_to_python_path(path): sys.path.insert(0, path) if os.environ.has_key('PYTHONPATH'): - os.environ['PYTHONPATH'] += ':' + path + old_path = os.environ['PYTHONPATH'] + os.environ['PYTHONPATH'] = path + ':' + old_path else: os.environ['PYTHONPATH'] = path @@ -52,6 +51,10 @@ def start_matchbox(): def stop_matchbox(): os.kill(xephyr_pid) + +start_xephyr() +os.environ['DISPLAY'] = ":%d" % (XEPHYR_DISPLAY) +start_matchbox() i = 0 dbus_daemon_pid = None @@ -83,10 +86,6 @@ else: import sugar.env add_to_python_path(os.path.join(sugar.env.get_data_dir(), 'shell')) print 'Running the installed sugar...' - -start_xephyr() -os.environ['DISPLAY'] = ":%d" % (XEPHYR_DISPLAY) -start_matchbox() print 'Redirecting output to the console, press Ctrl+Down to open it.' |