8 files changed, 34 insertions, 16 deletions
diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c
index 59160cda..8c62cc1f 100644
--- a/capplets/accessibility/at-properties/main.c
+++ b/capplets/accessibility/at-properties/main.c
@@ -211,7 +211,6 @@ setup_dialog (GtkBuilder *builder, GSettings *settings)
 {
 GtkWidget *widget;
 GObject *object;
- GObject *peditor;
 
 object = gtk_builder_get_object (builder, "at_enable_toggle");
 g_signal_connect (object, "toggled",
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index 65e703ad..b16b76fe 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -38,7 +38,9 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context)
 GtkBuilder *ui;
 GError *err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 32, 0)
 g_thread_init (NULL);
+#endif
 gdk_threads_init ();
 gdk_threads_enter ();
 theme_thumbnail_factory_init (*argc, *argv);
diff --git a/capplets/appearance/appearance-support.c b/capplets/appearance/appearance-support.c
index 42b906cc..25cc003c 100644
--- a/capplets/appearance/appearance-support.c
+++ b/capplets/appearance/appearance-support.c
@@ -57,21 +57,34 @@ metacity_is_running()
 }
 
 static void
-metacity_theme_apply(const gchar *theme)
+metacity_theme_apply(const gchar *theme, const gchar *font)
 {
 /* set theme, we use gconf and gsettings binaries to avoid schemas and versions issues */
 if (is_program_in_path ("gconftool-2"))
 {
- gchar *gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/theme '%s'", theme);
+ gchar *gconf_cmd = NULL;
+
+ gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/theme '%s'", theme);
+ g_spawn_command_line_async (gconf_cmd, NULL);
+ g_free (gconf_cmd);
+
+ gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/titlebar_font '%s'", font);
 g_spawn_command_line_async (gconf_cmd, NULL);
 g_free (gconf_cmd);
 }
 
 if (is_program_in_path ("gsettings"))
 {
- gchar *gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences theme '%s'", theme);
+ gchar *gsettings_cmd = NULL;
+
+ gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences theme '%s'", theme);
 g_spawn_command_line_async (gsettings_cmd, NULL);
 g_free (gsettings_cmd);
+
+ gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences titlebar-font '%s'", font);
+ g_spawn_command_line_async (gsettings_cmd, NULL);
+ g_free (gsettings_cmd);
+
 }
 }
 
@@ -79,11 +92,14 @@ static void
 marco_theme_changed(GSettings *settings, gchar *key, AppearanceData* data)
 {
 gchar *theme = NULL;
+ gchar *font = NULL;
 if (metacity_is_running ())
 {
- theme = g_settings_get_string (settings, key);
- metacity_theme_apply (theme);
+ theme = g_settings_get_string (settings, MARCO_THEME_KEY);
+ font = g_settings_get_string (settings, WINDOW_TITLE_FONT_KEY);
+ metacity_theme_apply (theme, font);
 g_free (theme);
+ g_free (font);
 }
 }
 
@@ -92,12 +108,14 @@ support_init(AppearanceData* data)
 {
 /* needed for wm_common_get_current_window_manager() */
 wm_common_update_window ();
- /* GSettings signal */
+ /* GSettings signals */
 g_signal_connect (data->marco_settings, "changed::" MARCO_THEME_KEY,
 G_CALLBACK (marco_theme_changed), data);
+ g_signal_connect (data->marco_settings, "changed::" WINDOW_TITLE_FONT_KEY,
+ G_CALLBACK (marco_theme_changed), data);
 /* apply theme at start */
 if (metacity_is_running ())
- marco_theme_changed (data->marco_settings, MARCO_THEME_KEY, data);
+ marco_theme_changed (data->marco_settings, NULL, data);
 }
 
 void
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 433b25db..7b3d2057 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -229,7 +229,6 @@ add_key (GtkWidget *widget,
 GtkComboBox *box = GTK_COMBO_BOX (widget);
 GtkTreeModel *model = gtk_combo_box_get_model (box);
 GtkListStore *store = GTK_LIST_STORE (model);
- gboolean retval;
 
 info.text = text;
 info.found = FALSE;
@@ -248,11 +247,6 @@ add_key (GtkWidget *widget,
 5, rotation,
 -1);
 
- retval = TRUE;
- }
- else
- {
- retval = FALSE;
 }
 }
 
diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
index ab3eaa6e..da017f17 100644
--- a/capplets/keybindings/mate-keybinding-properties.c
+++ b/capplets/keybindings/mate-keybinding-properties.c
@@ -1935,7 +1935,9 @@ main (int argc, char *argv[])
 GtkBuilder *builder;
 GSettings *marco_settings;
 
+#if !GLIB_CHECK_VERSION (2, 32, 0)
 g_thread_init (NULL);
+#endif
 gtk_init (&argc, &argv);
 
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c
index bb611336..d1eaa515 100644
--- a/capplets/network/mate-network-properties.c
+++ b/capplets/network/mate-network-properties.c
@@ -380,7 +380,6 @@ cb_ignore_hosts_gsettings_changed (GSettings *settings, gchar *key, gpointer use
 static void
 setup_dialog (GtkBuilder *builder)
 {
- gint mode;
 GSList *mode_group;
 GtkListStore *store;
 
diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c
index 45928e63..24525f64 100644
--- a/font-viewer/font-thumbnailer.c
+++ b/font-viewer/font-thumbnailer.c
@@ -256,8 +256,12 @@ main(int argc, char **argv)
 
 setlocale (LC_ALL, "");
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
 g_type_init ();
+#endif
+#if !GLIB_CHECK_VERSION (2, 32, 0)
 g_thread_init (NULL);
+#endif
 
 context = g_option_context_new (NULL);
 g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
diff --git a/org.mate.control-center.gschema.xml.in.in b/org.mate.control-center.gschema.xml.in.in
index 7b446a24..d50958f2 100644
--- a/org.mate.control-center.gschema.xml.in.in
+++ b/org.mate.control-center.gschema.xml.in.in
@@ -2,7 +2,7 @@
 <schema id="org.mate.control-center" path="/org/mate/control-center/">
 <child name="appearance" schema="org.mate.control-center.appearance" />
 <key name="cc-actions-list" type="as">
- <_default l10n="messages">[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;default-applications.desktop' ]</_default>
+ <_default l10n="messages">[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;mate-default-applications-properties.desktop' ]</_default>
 <_summary>Task names and associated .desktop files</_summary>
 <_description>The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</_description>
 </key>