Use new GTK+ convenience API for icon view tooltips. (#455985)

2007-07-12  Jens Granseuer  <jensgr@gmx.net>

        * appearance-desktop.c: Use new GTK+ convenience API for
        icon view tooltips.  (#455985)



svn path=/trunk/; revision=7867
This commit is contained in:
Jens Granseuer 2007-07-23 18:21:39 +00:00 committed by Matthias Clasen
parent 95f4f84c5a
commit 0e16486c79
4 changed files with 28 additions and 18 deletions

View file

@ -1,3 +1,7 @@
2007-0723 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump GTK+ requirement to 2.11.6
2007-07-19 Jens Granseuer <jensgr@gmx.net>
* configure.in: fix last commit when building without gstreamer

View file

@ -1,3 +1,8 @@
2007-07-12 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: Use new GTK+ convenience API for
icon view tooltips. (#455985)
2007-07-12 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (wp_load_stuffs), (desktop_init),

View file

@ -715,7 +715,7 @@ wp_dragged_image (GtkWidget *widget,
}
}
#if GTK_CHECK_VERSION (2,11,0)
#if GTK_CHECK_VERSION (2,11,6)
static gboolean
wp_view_tooltip_cb (GtkWidget *widget,
gint x,
@ -724,26 +724,27 @@ wp_view_tooltip_cb (GtkWidget *widget,
GtkTooltip *tooltip,
AppearanceData *data)
{
GtkTreePath *path;
GtkTreeIter iter;
gchar *wpfile;
GnomeWPItem *item;
path = gtk_icon_view_get_path_at_pos (data->wp_view, x, y);
if (gtk_icon_view_get_tooltip_context (data->wp_view,
&x, &y,
keyboard_mode,
NULL,
NULL,
&iter))
{
gtk_tree_model_get (data->wp_model, &iter, 2, &wpfile, -1);
item = g_hash_table_lookup (data->wp_hash, wpfile);
g_free (wpfile);
if (path == NULL)
return FALSE;
gtk_tree_model_get_iter (data->wp_model, &iter, path);
gtk_tree_path_free (path);
gtk_tree_model_get (data->wp_model, &iter, 2, &wpfile, -1);
item = g_hash_table_lookup (data->wp_hash, wpfile);
g_free (wpfile);
gtk_tooltip_set_markup (tooltip, item->description);
return TRUE;
gtk_tooltip_set_markup (tooltip, item->description);
return TRUE;
}
return FALSE;
}
#endif
@ -1053,7 +1054,7 @@ desktop_init (AppearanceData *data,
g_signal_connect (G_OBJECT (data->wp_view), "selection-changed",
G_CALLBACK (wp_props_wp_selected), data);
#if GTK_CHECK_VERSION (2,11,0)
#if GTK_CHECK_VERSION (2,11,6)
g_signal_connect (G_OBJECT (data->wp_view), "query-tooltip",
G_CALLBACK (wp_view_tooltip_cb), data);
#endif

View file

@ -20,7 +20,7 @@ GNOME_DOC_INIT
m4_define(gnomevfs_minver, 2.0.0)
m4_define(fontconfig_minver, 1.0.0)
m4_define(xft_minver, 2.1.2)
m4_define(gtk_minver, 2.10.0)
m4_define(gtk_minver, 2.11.6)
m4_define(libbonobo_minver, 2.0.0)
m4_define(libgnomeui_minver, 2.2.0)
m4_define(nautilus_minver, 2.6.0)