Bug 568229 – library needs libtool versioning

[evince.git] / cut-n-paste / zoom-control / ephy-zoom-control.c

diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c
index ada61f2ec7c97cf70fa0259b2897c18489276c72..66efbaad1af8dc6a114731159dcff56648251664 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -26,8 +26,6 @@
 #include "ephy-zoom.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktooltips.h>
 #include <glib/gi18n.h>
 
 #define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate))
@@ -175,8 +173,7 @@ ephy_zoom_control_init (EphyZoomControl *control)
                                              NULL, NULL);
 
        gtk_combo_box_set_focus_on_click (p->combo, FALSE);
-       g_object_ref (p->combo);
-       gtk_object_sink (GTK_OBJECT (p->combo));
+       g_object_ref_sink (G_OBJECT (p->combo));
        gtk_widget_show (GTK_WIDGET (p->combo));
 
        i = ephy_zoom_get_zoom_level_index (p->zoom);
@@ -235,6 +232,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 +284,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 +301,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,