Revert "Setup xsettings dinamically so that we can take"

This reverts commit 457540e27e11ad2640aba8f306200a8ad8926bfb.

2 files changed, 9 insertions, 19 deletions

diff --git a/src/emulator.py b/src/emulator.py
index f54bdf2..23ceea1 100755
--- a/src/emulator.py
+++ b/src/emulator.py
@@ -131,6 +131,15 @@ def main():
     else:
         os.environ['SUGAR_XO_STYLE'] = 'no'
     
+    if options.xo_style:
+        gtkrc_filename = 'sugar-xo.gtkrc'
+    else:
+        gtkrc_filename = 'sugar.gtkrc'
+        os.environ['SUGAR_XO_STYLE'] = 'no'
+    
+    gtkrc_path = os.path.join(config.data_path, gtkrc_filename)
+    os.environ['GTK2_RC_FILES'] = gtkrc_path
+
     command = ['dbus-launch', 'dbus-launch', '--exit-with-session']
 
     if not args:
diff --git a/src/main.py b/src/main.py
index f41c451..e785707 100644
--- a/src/main.py
+++ b/src/main.py
@@ -31,7 +31,6 @@ import gobject
 from sugar import env
 from sugar import logger
 from sugar.profile import get_profile
-from sugar.graphics import style
 
 from view.Shell import Shell
 from model.shellmodel import ShellModel
@@ -66,23 +65,6 @@ def _save_session_info():
 
     f.close()
 
-def _setup_screen_settings():
-    settings = gtk.settings_get_default()
-    ctx = 'sugar-shell'
-
-    if gtk.gdk.screen_width() > 1024:
-        theme = 'sugar-xo'
-    else:
-        theme = 'sugar'
-    settings.set_string_property('gtk-theme-name', 'sugar', ctx)
-
-    font = 'Sans Serif %d' % style.FONT_SIZE
-    settings.set_string_property('gtk-font-name', font, ctx)
-
-    settings.set_string_property('gtk-icon-theme-name', 'sugar', ctx)
-    settings.set_string_property('gtk-cursor-theme-name', 'sugar', ctx)
-    settings.set_long_property('gtk-toolbar-style', gtk.TOOLBAR_ICONS, ctx)
-
 def _setup_translations():
     locale_path = os.path.join(config.prefix, 'share', 'locale')
     domain = 'sugar'
@@ -116,7 +98,6 @@ def main():
     _save_session_info()
     _start_matchbox()
     _setup_translations()
-    _setup_screen_settings()
 
     hw_manager = hardwaremanager.get_manager()
     hw_manager.startup()