From 02540c3dc737c970d5a444407ab7be7cad20bed8 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 25 Dec 2006 12:17:35 +0000 Subject: Only use the statusbar size-allocate hack on gtk <= 2.10 now that gtk bug 2006-12-25 Christian Persch * src/ephy-statusbar.c: (ephy_statusbar_class_init): Only use the statusbar size-allocate hack on gtk <= 2.10 now that gtk bug #372452 is fixed. --- src/ephy-statusbar.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c index e5ed179e7..e17bd465b 100755 --- a/src/ephy-statusbar.c +++ b/src/ephy-statusbar.c @@ -35,6 +35,7 @@ #include #include #include +#include static void ephy_statusbar_class_init (EphyStatusbarClass *klass); static void ephy_statusbar_init (EphyStatusbar *t); @@ -92,7 +93,7 @@ ephy_statusbar_get_type (void) return type; } -/* FIXME: remove this hack once gtk bug #372452 is fixed! */ +#if !GTK_CHECK_VERSION (2, 11, 0) static void ephy_statusbar_size_allocate (GtkWidget *widget, GtkAllocation *allocation) @@ -110,18 +111,23 @@ ephy_statusbar_size_allocate (GtkWidget *widget, gstatusbar->label = label; } +#endif /* GTK 2.11.0 */ static void ephy_statusbar_class_init (EphyStatusbarClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); +#if !GTK_CHECK_VERSION (2, 11, 0) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); +#endif parent_class = g_type_class_peek_parent (klass); object_class->finalize = ephy_statusbar_finalize; +#if !GTK_CHECK_VERSION (2, 11, 0) widget_class->size_allocate = ephy_statusbar_size_allocate; +#endif signals[LOCK_CLICKED] = g_signal_new -- cgit