diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-11-18 23:18:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-11-18 23:18:13 +0000 |
| commit | 8271b9df0751bb28b194cb25ab3f14363c7f166b (patch) | |
| tree | d4d5179f123b7c987af943ad84b1e35807b7abf3 /gtk | |
| parent | b977d5af8fe25c58120abe4ab5a966fcd53b4d6f (diff) | |
| download | gtk+-8271b9df0751bb28b194cb25ab3f14363c7f166b.tar.gz | |
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.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtksettings.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 0b80dacb6d..a9b7537e03 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -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); } |