|
|
1
|
+diff --git a/capplets/appearance/appearance-support.c b/capplets/appearance/appearance-support.c
|
|
|
2
|
+index 7c339e5..b40419a 100644
|
|
|
3
|
+--- a/capplets/appearance/appearance-support.c
|
|
|
4
|
++++ b/capplets/appearance/appearance-support.c
|
|
|
5
|
+@@ -100,19 +100,41 @@ metacity_theme_apply(const gchar *theme, const gchar *font)
|
|
|
6
|
+ }
|
|
|
7
|
+ }
|
|
|
8
|
+
|
|
|
9
|
++static void
|
|
|
10
|
++color_scheme_apply(const gchar *theme)
|
|
|
11
|
++{
|
|
|
12
|
++ if (is_program_in_path ("gsettings"))
|
|
|
13
|
++ {
|
|
|
14
|
++ gchar *gsettings_cmd = NULL;
|
|
|
15
|
++
|
|
|
16
|
++ /* Make libhandy apps dark/light */
|
|
|
17
|
++ if (g_str_has_suffix (theme, "-dark"))
|
|
|
18
|
++ {
|
|
|
19
|
++ gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.interface color-scheme prefer-dark");
|
|
|
20
|
++ } else
|
|
|
21
|
++ {
|
|
|
22
|
++ gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.interface color-scheme default");
|
|
|
23
|
++ }
|
|
|
24
|
++ g_spawn_command_line_async (gsettings_cmd, NULL);
|
|
|
25
|
++ g_free (gsettings_cmd);
|
|
|
26
|
++ }
|
|
|
27
|
++}
|
|
|
28
|
++
|
|
|
29
|
+ static void
|
|
|
30
|
+ marco_theme_changed(GSettings *settings, gchar *key, AppearanceData* data)
|
|
|
31
|
+ {
|
|
|
32
|
+ gchar *theme = NULL;
|
|
|
33
|
+ gchar *font = NULL;
|
|
|
34
|
++
|
|
|
35
|
++ theme = g_settings_get_string (settings, MARCO_THEME_KEY);
|
|
|
36
|
++ font = g_settings_get_string (settings, WINDOW_TITLE_FONT_KEY);
|
|
|
37
|
++ color_scheme_apply (theme);
|
|
|
38
|
+ if (metacity_is_running ())
|
|
|
39
|
+ {
|
|
|
40
|
+- theme = g_settings_get_string (settings, MARCO_THEME_KEY);
|
|
|
41
|
+- font = g_settings_get_string (settings, WINDOW_TITLE_FONT_KEY);
|
|
|
42
|
+ metacity_theme_apply (theme, font);
|
|
|
43
|
+- g_free (theme);
|
|
|
44
|
+- g_free (font);
|
|
|
45
|
+ }
|
|
|
46
|
++ g_free (theme);
|
|
|
47
|
++ g_free (font);
|
|
|
48
|
+ }
|
|
|
49
|
+
|
|
|
50
|
+ void
|
|
|
51
|
+@@ -126,8 +148,7 @@ support_init(AppearanceData* data)
|
|
|
52
|
+ g_signal_connect (data->marco_settings, "changed::" WINDOW_TITLE_FONT_KEY,
|
|
|
53
|
+ G_CALLBACK (marco_theme_changed), data);
|
|
|
54
|
+ /* apply theme at start */
|
|
|
55
|
+- if (metacity_is_running ())
|
|
|
56
|
+- marco_theme_changed (data->marco_settings, NULL, data);
|
|
|
57
|
++ marco_theme_changed (data->marco_settings, NULL, data);
|
|
|
58
|
+ }
|
|
|
59
|
+
|
|
|
60
|
+ void |