Commit 8271b9df authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Clean up a bit of duplicated code.

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.
parent b977d5af
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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);
}
......
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