summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@async.com.br>2008-06-20 14:19:22 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-06-20 14:19:22 +0000
commitc4aa58f9bc5371d202eba28a83f5d4d67faa111a (patch)
tree0e2677458965eaed7445f72b7d07a8d3c8599671
parentf87182ac4328ca4abfc44e05d641907f6208890a (diff)
downloadgtk+-c4aa58f9bc5371d202eba28a83f5d4d67faa111a.tar.gz
Remove unused variable and check if the widget is a GtkWidget subclass,
2008-06-20 Johan Dahlin <jdahlin@async.com.br> * 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
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtkwidget.c3
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 <jdahlin@async.com.br>
+
+ * 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 <mitch@imendio.com>
* 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;
}