From: Carlos Garcia Campos Date: Wed, 11 Jul 2007 16:22:43 +0000 (+0000) Subject: Fix build with gtk+ >= 2.11.5 due to gtktooltips deprecation. Fixes bug X-Git-Tag: EVINCE_0_9_3~30 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=4cabc192ea93da44cbeb53396c21b1d7589cee46;p=evince.git Fix build with gtk+ >= 2.11.5 due to gtktooltips deprecation. Fixes bug 2007-07-11 Carlos Garcia Campos * 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 --- diff --git a/ChangeLog b/ChangeLog index 519b9fc9..a90dc199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-07-11 Carlos Garcia Campos + + * 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 + 2007-07-10 Nickolay V. Shmyrev * NEWS: 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 #include +#if !GTK_CHECK_VERSION (2, 11, 5) #include +#endif #include #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, diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index a9c66e7b..62adea9d 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA. #include #include #include +#include #include @@ -328,17 +329,27 @@ egg_find_bar_init (EggFindBar *find_bar) arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE); priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Previous")); gtk_tool_item_set_is_important (priv->previous_button, TRUE); +#if GTK_CHECK_VERSION (2, 11, 5) + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button), + _("Find previous occurrence of the search string")); +#else gtk_tool_item_set_tooltip (priv->previous_button, GTK_TOOLBAR (find_bar)->tooltips, _("Find previous occurrence of the search string"), NULL); +#endif /* Next */ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE); priv->next_button = gtk_tool_button_new (arrow, Q_("Find Next")); gtk_tool_item_set_is_important (priv->next_button, TRUE); +#if GTK_CHECK_VERSION (2, 11, 5) + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->next_button), + _("Find next occurrence of the search string")); +#else gtk_tool_item_set_tooltip (priv->next_button, GTK_TOOLBAR (find_bar)->tooltips, _("Find next occurrence of the search string"), NULL); +#endif /* Separator*/ priv->status_separator = gtk_separator_tool_item_new(); @@ -347,9 +358,14 @@ egg_find_bar_init (EggFindBar *find_bar) priv->case_button = gtk_toggle_tool_button_new (); g_object_set (G_OBJECT (priv->case_button), "label", _("C_ase Sensitive"), NULL); gtk_tool_item_set_is_important (priv->case_button, TRUE); +#if GTK_CHECK_VERSION (2, 11, 5) + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->case_button), + _("Toggle case sensitive search")); +#else gtk_tool_item_set_tooltip (priv->case_button, GTK_TOOLBAR (find_bar)->tooltips, _("Toggle case sensitive search"), NULL); +#endif /* Status */ priv->status_item = gtk_tool_item_new(); gtk_tool_item_set_expand (priv->status_item, TRUE);