aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-27 14:31:09 +0300
committerJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-01 10:04:29 +0300
commit4cde28c66045b89a4b4b83e3406955d8632b5c02 (patch)
treeb6748cca7d105391d5edc639a1567f70234dc50e
parent4a06d2169cf1fdcb4427c105fdc54fc80c3f334b (diff)
downloadxsettings-daemon-4cde28c66045b89a4b4b83e3406955d8632b5c02.tar.gz
xsettings-daemon-4cde28c66045b89a4b4b83e3406955d8632b5c02.tar.bz2
xsettings-daemon-4cde28c66045b89a4b4b83e3406955d8632b5c02.zip
Support MATCHBOX/THEME xsetting
MBWM no longer sets window manager theme based on toolkit theme to allow different names for toolkit and WM themes: Add a gconf key for the matchbox theme name and connect it to "MATCHBOX/THEME" xsetting. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-rw-r--r--settings-daemon.c2
-rw-r--r--settings-daemon.schemas16
2 files changed, 16 insertions, 2 deletions
diff --git a/settings-daemon.c b/settings-daemon.c
index 7dce4b8..a995b35 100644
--- a/settings-daemon.c
+++ b/settings-daemon.c
@@ -171,6 +171,8 @@ static const TranslationEntry translations [] = {
GCONF_VALUE_INT, translate_int_int },
{ "/desktop/poky/interface/theme", "Net/ThemeName",
GCONF_VALUE_STRING, translate_string_string },
+ { "/desktop/poky/interface/matchbox_theme", "MATCHBOX/THEME",
+ GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/poky/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle",
GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/poky/interface/gtk-im-status-style", "Gtk/IMStatusStyle",
diff --git a/settings-daemon.schemas b/settings-daemon.schemas
index 02279e8..811957b 100644
--- a/settings-daemon.schemas
+++ b/settings-daemon.schemas
@@ -3,14 +3,26 @@
<schemalist>
<schema>
+ <key>/schemas/desktop/poky/interface/matchbox_theme</key>
+ <applyto>/desktop/poky/interface/matchbox_theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>Sato</default>
+ <locale name="C">
+ <short>WM theme</short>
+ <long>Matchbox Window manager theme name.</long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/desktop/poky/interface/theme</key>
<applyto>/desktop/poky/interface/theme</applyto>
<type>string</type>
<owner>settings-daemon</owner>
<default>Clearlooks</default>
<locale name="C">
- <short>Desktop theme</short>
- <long>The theme name for Matchbox and GTK+ to use.</long>
+ <short>GTK+ theme</short>
+ <long>GTK+ theme name.</long>
</locale>
</schema>