diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-15 12:49:24 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-15 12:49:24 (GMT) |
| commit | 2910d23716be4f8eae164bdc047cb7a7d22f3c22 (patch) | |
| tree | 7b4fa5e931b9e2e541a8fb4004d2b0beed5c8448 | |
| parent | ba23a6ed3a1b77fe8515584a439529a3db22c862 (diff) | |
Delay importing the sugar module
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rwxr-xr-x | sugar-emulator | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index bb874fb..99f5525 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -4,7 +4,6 @@ bin_SCRIPTS = sugar-shell sugardir = $(pkgdatadir)/shell sugar_PYTHON = \ - __init__.py \ shellservice.py confdir = $(pkgdatadir)/shell diff --git a/sugar-emulator b/sugar-emulator index d4005d5..f7fc133 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -25,8 +25,6 @@ pygtk.require('2.0') import gtk import gobject -from sugar import env - def _get_display_number(): """Find a free display number trying to connect to 6000+ ports""" retries = 20 @@ -90,6 +88,8 @@ else: _gtk_xft_dpi = float(gtk.settings_get_default().get_property('gtk-xft-dpi')) _start_xephyr(width, height, _gtk_xft_dpi / 1024) +from sugar import env + os.environ['GTK2_RC_FILES'] = env.get_data_path('gtkrc') os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) |