Fix build with gtk+ >= 2.11.5 due to gtktooltips deprecation. Fixes bug

[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 d3b7e572d130c1abda8afd8e7041be9a560af9ad..2f372d9016a00314076a297c754a97e3d27292dc 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -24,11 +24,12 @@
 
 #include "ephy-zoom-control.h"
 #include "ephy-zoom.h"
-#include "ev-debug.h"
 
 #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))
@@ -73,7 +74,7 @@ ephy_zoom_control_get_type (void)
 
        if (G_UNLIKELY (type == 0))
        {
-               static const GTypeInfo our_info =
+               const GTypeInfo our_info =
                        {
                                sizeof (EphyZoomControlClass),
                                NULL, /* base_init */
@@ -152,10 +153,16 @@ ephy_zoom_control_init (EphyZoomControl *control)
        for (i = 0; i < n_zoom_levels; i++)
        {
                gtk_list_store_append (store, &iter);
-               gtk_list_store_set    (store, &iter,
-                                      COL_TEXT, zoom_levels[i].name,
-                                      COL_IS_SEP, zoom_levels[i].name == NULL,
-                                      -1);
+
+               if (zoom_levels[i].name != NULL) {
+                       gtk_list_store_set (store, &iter,
+                                           COL_TEXT, _(zoom_levels[i].name),
+                                           -1);
+               } else {
+                       gtk_list_store_set (store, &iter,
+                                           COL_IS_SEP, zoom_levels[i].name == NULL,
+                                           -1);
+               }
        }
 
        p->combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)));
@@ -230,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)
@@ -281,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)
@@ -297,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,