daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up a bit of duplicated code.

Browse source 
Mon Nov 18 18:15:56 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksettings.c (gtk_settings_get_property): Clean up
        a bit of duplicated code.
This commit is contained in:
Owen Taylor 2002-11-18 23:18:13 +00:00 • committed by Owen Taylor
commit 8271b9df07
7 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

5
ChangeLog.pre-2-10
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

5
ChangeLog.pre-2-2
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

5
ChangeLog.pre-2-4
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

5
ChangeLog.pre-2-6
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

5
ChangeLog.pre-2-8
View file

@ -1,3 +1,8 @@
Mon Nov 18 18:15:56 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Clean up
a bit of duplicated code.
Mon Nov 18 20:42:27 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_expand_to_path): modify and

7
gtk/gtksettings.c
View file

@ -358,11 +358,8 @@ gtk_settings_get_property (GObject *object,
g_value_init (&val, G_TYPE_STRING);
if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION)
{
g_value_copy (&settings->property_values[property_id - 1].value, value);
}
else if (!gdk_screen_get_setting (settings->screen, pspec->name, &val))
if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION ||
!gdk_screen_get_setting (settings->screen, pspec->name, &val))
{
g_value_copy (&settings->property_values[property_id - 1].value, value);
}