Merge lp:~marmuta/unity-greeter/onboard-notify-theme-change into lp:unity-greeter

[marmuta]

This change writes the gtk-theme to gsettings and then notifies Onboard with the xsettings plugin of gnome-settings-daemon. Onboard has high contrast themes built-in, so it just switches to one of those when it gets the message.

I'm not quite sure if enabling xsettings is acceptble, though. You probably had your reasons to disable it before, however in my testing I didn't see any negative effects.

Have a look, please.

[Robert Ancell (robert-ancell)]

I just tried this and can confirm it changes the them of onboard and the shutdown dialog but it doesn't seem to change the theme of the widgets in the login screen and the indicators.

review: Needs Fixing

[lp:~marmuta/unity-greeter/onboard-notify-theme-change]

382. By marmuta on 2012-04-19

Don't set the GtkSettings theme anymore. Fixes widgets not being updated when the GSettings theme changes.

[marmuta (marmuta)]

How's this?

Unmerged revisions

382. By marmuta on 2012-04-19

Don't set the GtkSettings theme anymore. Fixes widgets not being updated when the GSettings theme changes.

381. By marmuta on 2012-04-05

Let Onboard know that the contrast setting has changed.

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-03-21 20:00:39 +0000
+++ src/menubar.vala	2012-04-19 15:06:24 +0000
@@ -430,11 +430,12 @@
 
     private void high_contrast_toggled_cb (Gtk.CheckMenuItem item)
     {
-        var settings = Gtk.Settings.get_default ();
+        var gsettings = new GDIGSettings();
         if (item.active)
-            settings.set ("gtk-theme-name", "HighContrastInverse");
+            gsettings.set_string(GDIGSettings.KEY_THEME_NAME, "HighContrastInverse");
         else
-            settings.set ("gtk-theme-name", default_theme_name);
+            gsettings.set_string(GDIGSettings.KEY_THEME_NAME, default_theme_name);
+
         high_contrast = item.active;
         UGSettings.set_boolean (UGSettings.KEY_HIGH_CONTRAST, high_contrast);
     }

=== modified file 'src/settings-daemon.vala'
--- src/settings-daemon.vala	2012-02-14 23:43:43 +0000
+++ src/settings-daemon.vala	2012-04-19 15:06:24 +0000
@@ -40,15 +40,15 @@
                              "org.gnome.settings-daemon.plugins.print-notifications",
                              "org.gnome.settings-daemon.plugins.smartcard",
                              "org.gnome.settings-daemon.plugins.sound",
-                             "org.gnome.settings-daemon.plugins.wacom",
-                             "org.gnome.settings-daemon.plugins.xsettings"};
+                             "org.gnome.settings-daemon.plugins.wacom"};
 
         string[] enabled =  {"org.gnome.settings-daemon.plugins.a11y-keyboard",
                              "org.gnome.settings-daemon.plugins.a11y-settings",
                              "org.gnome.settings-daemon.plugins.color",
                              "org.gnome.settings-daemon.plugins.cursor",
                              "org.gnome.settings-daemon.plugins.power",
-                             "org.gnome.settings-daemon.plugins.xrandr"};
+                             "org.gnome.settings-daemon.plugins.xrandr",
+                             "org.gnome.settings-daemon.plugins.xsettings"};
 
         foreach (var schema in disabled)
             set_plugin_enabled (schema, false);

=== modified file 'src/settings.vala'
--- src/settings.vala	2012-04-17 07:16:20 +0000
+++ src/settings.vala	2012-04-19 15:06:24 +0000
@@ -64,3 +64,22 @@
 
     private static const string SCHEMA = "com.canonical.unity-greeter";
 }
+
+
+public class GDIGSettings
+{
+    public static const string KEY_THEME_NAME = "gtk-theme";
+
+    public GDIGSettings ()
+    {
+        settings = new Settings(SCHEMA);
+    }
+    public bool set_string (string key, string value)
+    {
+        return settings.set_string (key, value);
+    }
+
+    private static const string SCHEMA = "org.gnome.desktop.interface";
+    private Settings settings;
+}
+

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-04-17 07:11:32 +0000
+++ src/unity-greeter.vala	2012-04-19 15:06:24 +0000
@@ -852,10 +852,13 @@
 
         /* Set GTK+ settings */
         debug ("Setting GTK+ settings");
+
+        var gsettings = new GDIGSettings();
+        var value = UGSettings.get_string (UGSettings.KEY_THEME_NAME);
+        if (value != "")
+            gsettings.set_string (GDIGSettings.KEY_THEME_NAME, value);
+
         var settings = Gtk.Settings.get_default ();
-        var value = UGSettings.get_string (UGSettings.KEY_THEME_NAME);
-        if (value != "")
-            settings.set ("gtk-theme-name", value, null);
         value = UGSettings.get_string (UGSettings.KEY_ICON_THEME_NAME);
         if (value != "")
             settings.set ("gtk-icon-theme-name", value, null);