From 7eefc853d171074e0104098642d06b3696d274c3 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Thu, 26 Jul 2007 19:04:44 +0000 Subject: [PATCH] really unset the gconf key when reverting colors 2007-07-26 Jens Granseuer * appearance-style.c: (update_color_buttons_from_settings), (color_scheme_defaults_button_clicked_cb): really unset the gconf key when reverting colors svn path=/trunk/; revision=7896 --- capplets/appearance/ChangeLog | 6 ++++++ capplets/appearance/appearance-style.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index 2722c0879..974a5b6c2 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,9 @@ +2007-07-26 Jens Granseuer + + * appearance-style.c: (update_color_buttons_from_settings), + (color_scheme_defaults_button_clicked_cb): really unset the gconf key + when reverting colors + 2007-07-26 Jens Granseuer * appearance-style.c: (update_color_buttons_from_string), diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index 6689f64d8..2c0c92579 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -185,11 +185,8 @@ update_color_buttons_from_settings (GtkSettings *settings, scheme = gconf_client_get_string (data->client, COLOR_SCHEME_KEY, NULL); g_object_get (G_OBJECT (settings), "gtk-color-scheme", &setting, NULL); - if (scheme == NULL || strcmp (scheme, "") == 0 || - theme_color_scheme_equal (scheme, setting)) - { + if (scheme == NULL || strcmp (scheme, "") == 0) gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE); - } g_free (scheme); update_color_buttons_from_string (setting, data); @@ -288,7 +285,7 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) static void color_scheme_defaults_button_clicked_cb (GtkWidget *button, AppearanceData *data) { - gconf_client_set_string (data->client, COLOR_SCHEME_KEY, "", NULL); + gconf_client_unset (data->client, COLOR_SCHEME_KEY, NULL); gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE); }