Commit e1926de8 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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
parent a8442c5d
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):
......
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment