diff options
| author | Ajay Garg <ajay@activitycentral.com> | 2012-10-18 09:29:10 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2012-10-18 09:29:10 (GMT) |
| commit | d6f14d797742cc3d89123157900ce787a94da4f8 (patch) | |
| tree | 962b27ef16dfd897ddb1a5dd01a2a26aca01d63b /bin | |
| parent | 7759b17c8c4801ab796b375a59f5545f9206726a (diff) | |
Revert "Accessibility"
Vrsion-3 coming up.
This reverts commit 7759b17c8c4801ab796b375a59f5545f9206726a.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/sugar-session | 6 | ||||
| -rw-r--r-- | bin/sugar.in | 23 |
2 files changed, 2 insertions, 27 deletions
diff --git a/bin/sugar-session b/bin/sugar-session index bfe4fb1..4f69f18 100755 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -257,7 +257,6 @@ def bootstrap(): GObject.idle_add(setup_notification_service_cb) GObject.idle_add(setup_file_transfer_cb) GObject.idle_add(show_software_updates_cb) - GObject.idle_add(setup_accessibility_cb) if _USE_XKL: GObject.idle_add(setup_keyboard_cb) @@ -278,11 +277,6 @@ def set_theme(): settings.set_property('gtk-theme-name', sugar_theme) settings.set_property('gtk-icon-theme-name', 'sugar') -def setup_accessibility_cb(): - from jarabe.model import accessibility - accessibility_manager = accessibility.AccessibilityManager() - accessibility_manager.setup_accessibility() - def main(): try: diff --git a/bin/sugar.in b/bin/sugar.in index d9a41ba..428cbf2 100644 --- a/bin/sugar.in +++ b/bin/sugar.in @@ -45,18 +45,7 @@ if test -z "$SUGAR_SCALING"; then export SUGAR_SCALING=100 fi -if gconftool-2 --dir-exists=/desktop/sugar/interface ; then - THEME="$(gconftool-2 --get /desktop/sugar/interface/gtk_theme)" - if [ "$THEME" = 'sugar-contrast' ]; then - GTK2_THEME="sugar-$SUGAR_SCALING-contrast" - else - GTK2_THEME="sugar-$SUGAR_SCALING" - fi -else - GTK2_THEME="sugar-$SUGAR_SCALING" -fi - -export GTK2_RC_FILES="@prefix@/share/sugar/data/$GTK2_THEME.gtkrc" +export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc" # Needed for executing wpa_passphrase export PATH="$PATH":/sbin:/usr/sbin @@ -81,15 +70,7 @@ if [ -f ~/.sugar/debug ]; then . ~/.sugar/debug fi - -if gconftool-2 --dir-exists=/desktop/sugar/peripherals/mouse ; then - CURSOR_THEME="$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme)" -else - CURSOR_THEME="sugar" -fi - - -echo Xcursor.theme: $CURSOR_THEME | xrdb -merge +echo Xcursor.theme: sugar | xrdb -merge metacity --no-force-fullscreen -d $DISPLAY & exec sugar-session |