From c4aa58f9bc5371d202eba28a83f5d4d67faa111a Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Fri, 20 Jun 2008 14:19:22 +0000 Subject: [PATCH] Remove unused variable and check if the widget is a GtkWidget subclass, 2008-06-20 Johan Dahlin * gtk/gtkwidget.c (gtk_widget_get_allocation): Remove unused variable and check if the widget is a GtkWidget subclass, not the uninitialized allocation. svn path=/trunk/; revision=20644 --- ChangeLog | 6 ++++++ gtk/gtkwidget.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 023a8d9e8a..a87fb57165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-20 Johan Dahlin + + * gtk/gtkwidget.c (gtk_widget_get_allocation): Remove unused variable + and check if the widget is a GtkWidget subclass, not the uninitialized + allocation. + 2008-06-20 Michael Natterer * gtk/gtkaccellabel.h diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 16a3aec509..1c4c305e4d 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -9899,8 +9899,7 @@ gtk_widget_get_has_tooltip (GtkWidget *widget) GtkAllocation gtk_widget_get_allocation (GtkWidget *widget) { - GtkAllocation allocation; - g_return_val_if_fail (GTK_IS_WIDGET (widget), allocation); + g_return_val_if_fail (GTK_IS_WIDGET (widget), widget); return widget->allocation; }