diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-25 20:17:35 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-25 20:17:35 +0800 |
| commit | 02540c3dc737c970d5a444407ab7be7cad20bed8 (patch) | |
| tree | 81968627c01b0755d3a7b32284662503c6fab017 | |
| parent | 49d3ad53d12cb2e4e4dcd5991a239cdfeefe9354 (diff) | |
| download | gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar.gz gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar.bz2 gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar.lz gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar.xz gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.tar.zst gsoc2013-epiphany-02540c3dc737c970d5a444407ab7be7cad20bed8.zip | |
Only use the statusbar size-allocate hack on gtk <= 2.10 now that gtk bug
2006-12-25 Christian Persch <chpe@cvs.gnome.org>
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | src/ephy-statusbar.c | 8 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2006-12-25 Christian Persch <chpe@cvs.gnome.org> + + * 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. + 2006-12-19 Luca Ferretti <elle.uca@libero.it> * data/ui/epiphany-ui.xml: 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 <gtk/gtkframe.h> #include <gtk/gtkwidget.h> #include <gtk/gtkvseparator.h> +#include <gtk/gtkversion.h> 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 |