Merge color scheme before sending notification.

2007-07-19  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtksettings.c (apply_queued_setting): Merge color
        scheme before sending notification.

svn path=/trunk/; revision=18504

diff --git a/ChangeLog b/ChangeLog
index 879ecef39845310fd08c1ee1796b811fc86cf488..a3e8ca77328cec922933518a72ca36a6c14a6408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtksettings.c (apply_queued_setting): Merge color
+       scheme before sending notification.  
+
 2007-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_tooltip_column):

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 3c7ce6f184fbc297e2d01df621b9f43e72b6e1dc..4488389e59cdeaad9e52d09be498698073115bf5 100644 (file)
--- 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
     {