diff --git a/fresh-tooltips.patch b/0001-New-tooltip-style.patch similarity index 91% rename from fresh-tooltips.patch rename to 0001-New-tooltip-style.patch index dfdfb88..93192a0 100644 --- a/fresh-tooltips.patch +++ b/0001-New-tooltip-style.patch @@ -1,6 +1,17 @@ -diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip.c ---- gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips 2010-05-30 02:52:44.000000000 -0400 -+++ gtk+-2.21.1/gtk/gtktooltip.c 2010-05-30 19:23:06.464923263 -0400 +From d5c9b3a4149fdeb40ac8377ba0867b447eb0f5aa Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 8 Jul 2010 17:58:40 -0400 +Subject: [PATCH] New tooltip style + +--- + gtk/gtktooltip.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + gtk/gtkwidget.c | 8 ++ + 2 files changed, 258 insertions(+), 11 deletions(-) + +diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c +index 67c2f6c..75fd6a7 100644 +--- a/gtk/gtktooltip.c ++++ b/gtk/gtktooltip.c @@ -33,6 +33,10 @@ #include "gtkhbox.h" #include "gtkalignment.h" @@ -12,7 +23,7 @@ diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip. #include "gtkalias.h" #undef DEBUG_TOOLTIP -@@ -97,6 +101,7 @@ static void gtk_tooltip_display_cl +@@ -97,6 +101,7 @@ static void gtk_tooltip_display_closed (GdkDisplay *display, GtkTooltip *tooltip); static void gtk_tooltip_set_last_window (GtkTooltip *tooltip, GdkWindow *window); @@ -20,7 +31,7 @@ diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip. G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); -@@ -112,8 +117,43 @@ gtk_tooltip_class_init (GtkTooltipClass +@@ -112,8 +117,43 @@ gtk_tooltip_class_init (GtkTooltipClass *klass) } static void @@ -100,7 +111,7 @@ diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip. tooltip->custom_widget = NULL; } -@@ -510,19 +561,208 @@ gtk_tooltip_window_style_set (GtkTooltip +@@ -510,19 +561,207 @@ gtk_tooltip_window_style_set (GtkTooltip *tooltip) gtk_widget_queue_draw (tooltip->window); } @@ -220,7 +231,6 @@ diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip. + if (gdk_screen_is_composited (screen)) + { + GdkRectangle rect; -+ GdkRegion *region; + const char *wm; + + gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0); @@ -319,10 +329,11 @@ diff -up gtk+-2.21.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.21.1/gtk/gtktooltip. return FALSE; } -diff -up gtk+-2.21.1/gtk/gtkwidget.c.fresh-tooltips gtk+-2.21.1/gtk/gtkwidget.c ---- gtk+-2.21.1/gtk/gtkwidget.c.fresh-tooltips 2010-05-30 02:52:44.000000000 -0400 -+++ gtk+-2.21.1/gtk/gtkwidget.c 2010-05-30 19:23:06.475923752 -0400 -@@ -2561,6 +2561,14 @@ gtk_widget_class_init (GtkWidgetClass *k +diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c +index d302589..0f71849 100644 +--- a/gtk/gtkwidget.c ++++ b/gtk/gtkwidget.c +@@ -2608,6 +2608,14 @@ gtk_widget_class_init (GtkWidgetClass *klass) P_("The length of vertical scroll arrows"), 1, G_MAXINT, 16, GTK_PARAM_READABLE)); @@ -337,3 +348,6 @@ diff -up gtk+-2.21.1/gtk/gtkwidget.c.fresh-tooltips gtk+-2.21.1/gtk/gtkwidget.c } static void +-- +1.7.1.1 + diff --git a/gtk3.spec b/gtk3.spec index 778751b..358de8d 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -11,7 +11,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 Version: 2.90.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -21,7 +21,7 @@ Source3: im-cedilla.conf Patch0: system-python.patch # https://bugzilla.gnome.org/show_bug.cgi?id=583273 -Patch1: fresh-tooltips.patch +Patch1: 0001-New-tooltip-style.patch # http://bugzilla.redhat.com/show_bug.cgi?id=529364 Patch2: remove-connecting-reason.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 @@ -264,6 +264,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %doc tmpdocs/examples %changelog +* Fri Jul 9 2010 Colin Walters - 2.90.4-3 +- Update tooltip style patch to remove unused GdkRegion + * Tue Jun 29 2010 Colin Walters - 2.90.4-2 - Changes to support rebuilds from snapshots