diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-07-11 16:22:43 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-07-11 16:22:43 (GMT) |
| commit | 4cabc192ea93da44cbeb53396c21b1d7589cee46 (patch) | |
| tree | 0ce522599f82a05c23307f4670dac3bcefd10275 /cut-n-paste | |
| parent | 7cf6e35e5ed710ec191383c57ce21db02eeed509 (diff) | |
Fix build with gtk+ >= 2.11.5 due to gtktooltips deprecation. Fixes bug
2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org>
* cut-n-paste/zoom-control/ephy-zoom-control.c:
* shell/eggfindbar.c: (egg_find_bar_init):
Fix build with gtk+ >= 2.11.5 due to gtktooltips
deprecation. Fixes bug #455667
svn path=/trunk/; revision=2571
Diffstat (limited to 'cut-n-paste')
| -rw-r--r-- | cut-n-paste/zoom-control/ephy-zoom-control.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c index ada61f2..2f372d9 100644 --- a/cut-n-paste/zoom-control/ephy-zoom-control.c +++ b/cut-n-paste/zoom-control/ephy-zoom-control.c @@ -27,7 +27,9 @@ #include <gtk/gtk.h> #include <gtk/gtkcombobox.h> +#if !GTK_CHECK_VERSION (2, 11, 5) #include <gtk/gtktooltips.h> +#endif #include <glib/gi18n.h> #define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate)) @@ -235,6 +237,7 @@ ephy_zoom_control_get_property (GObject *object, } } +#if !GTK_CHECK_VERSION (2, 11, 5) static void set_combo_tooltip (GtkWidget *widget, GtkTooltipsData *data) @@ -286,6 +289,7 @@ ephy_zoom_control_set_tooltip (GtkToolItem *tool_item, return TRUE; } +#endif /* !GTK_CHECK_VERSION (2, 11, 5) */ static void ephy_zoom_control_class_init (EphyZoomControlClass *klass) @@ -302,7 +306,9 @@ ephy_zoom_control_class_init (EphyZoomControlClass *klass) object_class->get_property = ephy_zoom_control_get_property; object_class->finalize = ephy_zoom_control_finalize; +#if !GTK_CHECK_VERSION (2, 11, 5) tool_item_class->set_tooltip = ephy_zoom_control_set_tooltip; +#endif g_object_class_install_property (object_class, PROP_ZOOM, |