From 7ea1e18d5c9c6c7157f722b253bf0641c7d92d2d Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Mon, 23 Jul 2007 18:43:37 +0000 Subject: [PATCH] bump all tooltips code to gtk 2.11.6 2007-07-23 Jens Granseuer * appearance-desktop.c: (desktop_init): bump all tooltips code to gtk 2.11.6 svn path=/trunk/; revision=7868 --- capplets/appearance/ChangeLog | 7 ++++++- capplets/appearance/appearance-desktop.c | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index d71a7af3d..ec754e05c 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,4 +1,9 @@ -2007-07-12 Jens Granseuer +2007-07-23 Jens Granseuer + + * appearance-desktop.c: (desktop_init): bump all tooltips code to gtk + 2.11.6 + +2007-07-23 Matthias Clasen * appearance-desktop.c: Use new GTK+ convenience API for icon view tooltips. (#455985) diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index d3ef10198..278c6f7dc 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -728,10 +728,10 @@ wp_view_tooltip_cb (GtkWidget *widget, gchar *wpfile; GnomeWPItem *item; - if (gtk_icon_view_get_tooltip_context (data->wp_view, - &x, &y, + if (gtk_icon_view_get_tooltip_context (data->wp_view, + &x, &y, keyboard_mode, - NULL, + NULL, NULL, &iter)) { @@ -740,10 +740,10 @@ wp_view_tooltip_cb (GtkWidget *widget, g_free (wpfile); gtk_tooltip_set_markup (tooltip, item->description); - + return TRUE; } - + return FALSE; } #endif @@ -927,7 +927,7 @@ desktop_init (AppearanceData *data, GtkWidget *add_button; GtkFileFilter *filter; -#if GTK_CHECK_VERSION (2,11,0) +#if GTK_CHECK_VERSION (2,11,6) GtkSettings *settings; settings = gtk_settings_get_default (); @@ -981,7 +981,7 @@ desktop_init (AppearanceData *data, data->wp_view = GTK_ICON_VIEW (glade_xml_get_widget (data->xml, "wp_view")); gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model)); -#if GTK_CHECK_VERSION (2,11,0) +#if GTK_CHECK_VERSION (2,11,6) g_object_set (G_OBJECT (data->wp_view), "has-tooltip", TRUE, NULL); #endif