diff --git a/control-center-tooltips.patch b/control-center-tooltips.patch new file mode 100644 index 0000000..9e5733b --- /dev/null +++ b/control-center-tooltips.patch @@ -0,0 +1,65 @@ +diff -up gnome-control-center-2.19.5/capplets/appearance/appearance-desktop.c.tooltips gnome-control-center-2.19.5/capplets/appearance/appearance-desktop.c +--- gnome-control-center-2.19.5/capplets/appearance/appearance-desktop.c.tooltips 2007-07-23 13:25:52.000000000 -0400 ++++ gnome-control-center-2.19.5/capplets/appearance/appearance-desktop.c 2007-07-23 13:26:05.000000000 -0400 +@@ -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 (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; ++ 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); ++ ++ gtk_tooltip_set_markup (tooltip, item->description); ++ ++ return TRUE; ++ } ++ ++ return FALSE; + } + #endif + +@@ -1040,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 diff --git a/control-center.spec b/control-center.spec index aed8a86..f25c3cc 100644 --- a/control-center.spec +++ b/control-center.spec @@ -2,7 +2,7 @@ %define pango_version 1.0.99.020703 %define glib2_version 2.13.0 -%define gtk2_version 2.6.0 +%define gtk2_version 2.11.6 %define gconf2_version 1.2.0 %define gnome_desktop_version 2.18.0-2 %define libgnome_version 2.3.0 @@ -60,6 +60,9 @@ Patch13: control-center-2.19.3-no-gnome-common.patch # disable for now, upstream plans conflicting changes #Patch16: control-center-2.18.0-be-more-async.patch +# fixed in upstream svn +Patch17: control-center-tooltips.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.17.91-passwd.patch Patch96: control-center-2.19.3-gecos.patch @@ -194,6 +197,7 @@ utilities. %patch13 -p1 -b .no-gnome-common #%patch14 -p1 -b .gnome-bg #%patch16 -p1 -b .be-more-async +%patch17 -p1 -b .tooltips # vendor configuration patches %patch95 -p1 -b .passwd @@ -371,6 +375,9 @@ fi %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Jul 23 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-3 +- Port to new GTK+ tooltips API + * Thu Jul 12 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-2 - Tiny improvement to the default applications capplet