From e1926de86a5a16dd63849b7f70658bd6af174cf3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 19 Jul 2007 15:32:04 +0000 Subject: [PATCH] Merge color scheme before sending notification. 2007-07-19 Matthias Clasen * gtk/gtksettings.c (apply_queued_setting): Merge color scheme before sending notification. svn path=/trunk/; revision=18504 --- ChangeLog | 5 +++++ gtk/gtksettings.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 879ecef398..a3e8ca7732 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-19 Matthias Clasen + + * gtk/gtksettings.c (apply_queued_setting): Merge color + scheme before sending notification. + 2007-07-19 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_set_tooltip_column): diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 3c7ce6f184..4488389e59 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1085,6 +1085,9 @@ apply_queued_setting (GtkSettings *data, if (_gtk_settings_parse_convert (parser, &qvalue->public.value, pspec, &tmp_value)) { + if (pspec->param_id == PROP_COLOR_SCHEME) + merge_color_scheme (data, &tmp_value, qvalue->source); + if (data->property_values[pspec->param_id - 1].source <= qvalue->source) { g_value_copy (&tmp_value, &data->property_values[pspec->param_id - 1].value); @@ -1092,8 +1095,6 @@ apply_queued_setting (GtkSettings *data, g_object_notify (G_OBJECT (data), g_param_spec_get_name (pspec)); } - if (pspec->param_id == PROP_COLOR_SCHEME) - merge_color_scheme (data, &tmp_value, qvalue->source); } else {