summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2008-10-30 15:04:38 +0000
committerSven Neumann <neo@src.gnome.org>2008-10-30 15:04:38 +0000
commit2c32cdd8939aae1db1af1dc54876c83fe9e05b17 (patch)
tree7359c75f685437323eec644aaeee7499c8bd4f59
parent0a91e7600ed098ebe53add385b80e0bb783890cb (diff)
downloadgtk+-2c32cdd8939aae1db1af1dc54876c83fe9e05b17.tar.gz
removed redundant conditional.
2008-10-30 Sven Neumann <sven@gimp.org> * gtk/gtkwidget.c (gtk_widget_get_property): removed redundant conditional. svn path=/trunk/; revision=21731
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkwidget.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e70b4427eb..6feff1c1ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30 Sven Neumann <sven@gimp.org>
+
+ * gtk/gtkwidget.c (gtk_widget_get_property): removed redundant
+ conditional.
+
2008-10-30 Christian Dywan <christian@imendio.com>
Bug 557316 – GtkLinkButton should consider user-defined tooltip
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d6dcc12c3e..02096596bc 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2542,10 +2542,7 @@ gtk_widget_get_property (GObject *object,
g_value_set_static_string (value, "");
break;
case PROP_PARENT:
- if (widget->parent)
- g_value_set_object (value, widget->parent);
- else
- g_value_set_object (value, NULL);
+ g_value_set_object (value, widget->parent);
break;
case PROP_WIDTH_REQUEST:
{