diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sugar-emulator | 9 | ||||
| -rw-r--r-- | bin/sugar-session | 18 | ||||
| -rw-r--r-- | bin/sugar.in | 6 |
3 files changed, 19 insertions, 14 deletions
diff --git a/bin/sugar-emulator b/bin/sugar-emulator index acd5976..7f06609 100644 --- a/bin/sugar-emulator +++ b/bin/sugar-emulator @@ -88,11 +88,10 @@ def _start_xephyr(dpi, dimensions, fullscreen): tries -= 1 time.sleep(0.1) -def _start_matchbox(): - cmd = ['matchbox-window-manager'] +def _start_window_manager(): + cmd = ['metacity'] - cmd.extend(['-use_titlebar', 'no']) - cmd.extend(['-theme', 'sugar']) + cmd.extend(['--no-force-fullscreen']) gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH) @@ -157,7 +156,7 @@ def main(): if not args: command.append('sugar') else: - _start_matchbox() + _start_window_manager() if args[0].endswith('.py'): command.append('python') diff --git a/bin/sugar-session b/bin/sugar-session index 6a5e9a4..c891bdb 100644 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -45,7 +45,7 @@ gettext.bindtextdomain('sugar', config.locale_path) gettext.bindtextdomain('sugar-toolkit', config.locale_path) gettext.textdomain('sugar') -from jarabe.desktop.homewindow import HomeWindow +from jarabe.desktop import homewindow from jarabe.model import sound from jarabe.view import launcher from jarabe import intro @@ -117,9 +117,10 @@ def setup_journal_cb(): from jarabe.journal import journalactivity journalactivity.start() -def show_software_updates_cb(home_window): +def show_software_updates_cb(): logging.debug('STARTUP: show_software_updates_cb') if os.path.isfile(os.path.expanduser('~/.sugar-update')): + home_window = homewindow.get_instance() home_window.get_home_box().show_software_updates_alert() def setup_notification_service_cb(): @@ -175,14 +176,17 @@ def main(): cleanup_logs() logger.start('shell') - intro.check_profile() - client = gconf.client_get_default() - timezone = client.get_string('/desktop/sugar/date/timezone') + client.set_string('/desktop/gnome/peripherals/mouse/cursor_theme', 'sugar') + client.set_string('/apps/metacity/general/mouse_button_modifier', + 'disabled') + timezone = client.get_string('/desktop/sugar/date/timezone') if timezone is not None and timezone: os.environ['TZ'] = timezone + intro.check_profile() + start_ui_service() start_session_manager() @@ -195,7 +199,7 @@ def main(): launcher.setup() - home_window = HomeWindow() + home_window = homewindow.get_instance() home_window.show() gobject.idle_add(unfreeze_dcon_cb) @@ -204,7 +208,7 @@ def main(): gobject.idle_add(setup_journal_cb) gobject.idle_add(setup_notification_service_cb) gobject.idle_add(setup_file_transfer_cb) - gobject.idle_add(show_software_updates_cb, home_window) + gobject.idle_add(show_software_updates_cb) try: import xklavier diff --git a/bin/sugar.in b/bin/sugar.in index 3c9b9b6..1c29a12 100644 --- a/bin/sugar.in +++ b/bin/sugar.in @@ -6,6 +6,9 @@ fi export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc" +# Needed for executing wpa_passphrase +export PATH="$PATH":/sbin:/usr/sbin + if ! test -f "$GTK2_RC_FILES"; then echo "sugar: ERROR: Gtk theme for scaling $SUGAR_SCALING not available in path $GTK2_RC_FILES" exit 1 @@ -16,7 +19,6 @@ if [ -f ~/.sugar/debug ]; then . ~/.sugar/debug fi -matchbox-window-manager -use_titlebar no -theme sugar \ - -kbdconfig @prefix@/share/sugar/data/kbdconfig & +metacity --no-force-fullscreen & exec sugar-session |