callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't overwrite application properties. Fixes bug #136802.

Browse Source 
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:
Mark McLoughlin
2004-03-11 17:54:19 +00:00
committed by Mark McLoughlin
parent a1707142b8
commit a4ab0dd44c
6 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

5
ChangeLog.pre-2-10
View File

@ -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> 2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

5
ChangeLog.pre-2-4
View File

@ -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> 2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

5
ChangeLog.pre-2-6
View File

@ -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> 2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

5
ChangeLog.pre-2-8
View File

@ -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> 2004-03-11 Dov Grobgeld <dov@imagic.weizmann.ac.il>
* gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

3
gtk/gtksettings.c
View File

@ -683,10 +683,13 @@ apply_queued_setting (GtkSettings *data,
g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec)); g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
if (_gtk_settings_parse_convert (parser, &qvalue->public.value, if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
pspec, &tmp_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); g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
data->property_values[pspec->param_id - 1].source = qvalue->source; data->property_values[pspec->param_id - 1].source = qvalue->source;
} }
}
else else
{ {
gchar *debug = g_strdup_value_contents (&qvalue->public.value); gchar *debug = g_strdup_value_contents (&qvalue->public.value);