don't overwrite application properties. Fixes bug #136802.
2004-03-11 Mark McLoughlin <mark@skynet.ie> * gtk/gtksettings.c: (apply_queued_setting): don't overwrite application properties. Fixes bug #136802.
This commit is contained in:
committed by
Mark McLoughlin
parent
a1707142b8
commit
a4ab0dd44c
@ -1,3 +1,8 @@
|
||||
2004-03-11 Mark McLoughlin <mark@skynet.ie>
|
||||
|
||||
* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
|
||||
application properties. Fixes bug #136802.
|
||||
|
||||
2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
|
||||
|
||||
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2004-03-11 Mark McLoughlin <mark@skynet.ie>
|
||||
|
||||
* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
|
||||
application properties. Fixes bug #136802.
|
||||
|
||||
2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
|
||||
|
||||
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2004-03-11 Mark McLoughlin <mark@skynet.ie>
|
||||
|
||||
* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
|
||||
application properties. Fixes bug #136802.
|
||||
|
||||
2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
|
||||
|
||||
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2004-03-11 Mark McLoughlin <mark@skynet.ie>
|
||||
|
||||
* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
|
||||
application properties. Fixes bug #136802.
|
||||
|
||||
2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
|
||||
|
||||
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2004-03-11 Mark McLoughlin <mark@skynet.ie>
|
||||
|
||||
* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
|
||||
application properties. Fixes bug #136802.
|
||||
|
||||
2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
|
||||
|
||||
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added
|
||||
|
||||
@ -683,10 +683,13 @@ apply_queued_setting (GtkSettings *data,
|
||||
g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
|
||||
if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
|
||||
pspec, &tmp_value))
|
||||
{
|
||||
if (data->property_values[pspec->param_id - 1].source <= qvalue->source)
|
||||
{
|
||||
g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
|
||||
data->property_values[pspec->param_id - 1].source = qvalue->source;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gchar *debug = g_strdup_value_contents (&qvalue->public.value);
|
||||
|
||||
Reference in New Issue
Block a user