X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=cut-n-paste%2Fzoom-control%2Fephy-zoom-control.c;h=66efbaad1af8dc6a114731159dcff56648251664;hb=7d10821fa9ae7cde776bcefb9278ac0371212045;hp=79076abe84229d3d2ae50988048fb0fecbb98f2a;hpb=47fb87e520d1abe31a1965d500602e0e80e899b2;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 79076abe..66efbaad 100644
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -24,11 +24,8 @@
 
 #include "ephy-zoom-control.h"
 #include "ephy-zoom.h"
-#include "ev-debug.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))
@@ -176,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);
@@ -236,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)
@@ -287,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)
@@ -303,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,