X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=cut-n-paste%2Fzoom-control%2Fephy-zoom-control.c;h=2f372d9016a00314076a297c754a97e3d27292dc;hb=8c23eed0775e4a24c5224c5ac59c373924adad3d;hp=ada61f2ec7c97cf70fa0259b2897c18489276c72;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c
index ada61f2e..2f372d90 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,