diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index bb2be0405..d24807008 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,8 @@ +2007-08-07 Jens Granseuer + + * appearance-style.c: (color_button_clicked_cb): remove stuff I forgot + to delete + 2007-08-07 Jens Granseuer * appearance-style.c: (color_button_clicked_cb): make sure the color diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index c331195e8..c78d75dc0 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -269,23 +269,13 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) /* verify that the scheme really has changed */ g_object_get (gtk_settings_get_default (), "gtk-color-scheme", &old_scheme, NULL); - if (old_scheme == NULL || - !gnome_theme_color_scheme_equal (old_scheme, scheme->str)) { + if (!gnome_theme_color_scheme_equal (old_scheme, scheme->str)) { gconf_client_set_string (data->client, COLOR_SCHEME_KEY, scheme->str, NULL); gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), TRUE); } g_free (old_scheme); g_string_free (scheme, TRUE); - -#if 0 - /* Currently we assume this has only been called when one of the colors has - * actually changed, so we don't check the original key first */ - gconf_client_set_string (data->client, COLOR_SCHEME_KEY, scheme->str, NULL); - g_string_free (scheme, TRUE); - - gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), TRUE); -#endif } static void