rpms/gtk2/F-12 fresh-tooltips.patch,1.6,1.7 gtk2.spec,1.427,1.428

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28346

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
work around a bug in the X automatic compositor


fresh-tooltips.patch:
 gtktooltip.c |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 gtkwidget.c  |    8 +
 2 files changed, 263 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fresh-tooltips.patch	28 Oct 2009 19:38:13 -0000	1.6
+++ fresh-tooltips.patch	28 Oct 2009 21:32:22 -0000	1.7
@@ -1,5 +1,6 @@
+diff -up gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips gtk+-2.18.3/gtk/gtktooltip.c
 --- gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips	2009-10-16 10:35:45.000000000 -0400
-+++ hacked/gtk/gtktooltip.c	2009-10-28 11:45:17.216105152 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-28 17:18:38.124009120 -0400
 @@ -29,6 +29,10 @@
  #include "gtkhbox.h"
  #include "gtkalignment.h"
@@ -11,7 +12,7 @@
  #include "gtkalias.h"
  
  #include <string.h>
-@@ -95,6 +99,7 @@
+@@ -95,6 +99,7 @@ static void       gtk_tooltip_display_cl
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
  						    GdkWindow       *window);
@@ -19,7 +20,7 @@
  
  
  G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +115,25 @@
+@@ -110,8 +115,25 @@ gtk_tooltip_class_init (GtkTooltipClass 
  }
  
  static void
@@ -45,25 +46,23 @@
    tooltip->timeout_id = 0;
    tooltip->browse_mode_timeout_id = 0;
  
-@@ -127,8 +149,17 @@
+@@ -127,8 +149,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    tooltip->last_window = NULL;
  
    tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
 +
 +  screen = gtk_widget_get_screen (tooltip->window);
 +  rgba = gdk_screen_get_rgba_colormap (screen);
-+  if (rgba)
++  if (rgba && gdk_screen_is_composited (screen))
 +    gtk_widget_set_colormap (tooltip->window, rgba);
 +
-+
    gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
  			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
 +
-+
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
    gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +176,7 @@
+@@ -145,7 +174,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_widget_show (tooltip->alignment);
  
    g_signal_connect_swapped (tooltip->window, "style-set",
@@ -72,7 +71,7 @@
    g_signal_connect_swapped (tooltip->window, "expose-event",
  			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
  
-@@ -162,6 +193,11 @@
+@@ -162,6 +191,11 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
  		      FALSE, FALSE, 0);
  
@@ -84,7 +83,7 @@
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +354,9 @@
+@@ -318,9 +352,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
   * Since: 2.14
   */
  void
@@ -97,7 +96,7 @@
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +507,229 @@
+@@ -471,27 +505,229 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -341,7 +340,7 @@
  
    return FALSE;
  }
-@@ -631,7 +869,7 @@
+@@ -631,7 +867,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -350,9 +349,10 @@
  	   *x, *y);
  #endif
  
---- gtk+-2.18.3/gtk/gtkwidget.c	2009-10-09 01:00:44.000000000 -0400
-+++ hacked/gtk/gtkwidget.c	2009-10-28 10:53:01.569855420 -0400
-@@ -2386,6 +2386,14 @@
+diff -up gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips gtk+-2.18.3/gtk/gtkwidget.c
+--- gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips	2009-10-09 01:00:44.000000000 -0400
++++ gtk+-2.18.3/gtk/gtkwidget.c	2009-10-28 17:17:02.854003713 -0400
+@@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k
                                                               P_("The length of vertical scroll arrows"),
                                                               1, G_MAXINT, 16,
                                                               GTK_PARAM_READABLE));


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -p -r1.427 -r1.428
--- gtk2.spec	28 Oct 2009 19:38:13 -0000	1.427
+++ gtk2.spec	28 Oct 2009 21:32:22 -0000	1.428
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -403,6 +403,9 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-15
+- Work around a bug in the X automatic compositor (#531443)
+
 * Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-14
 - Make the new tooltips sharp
 - Improve the Metacity compositor workaround for new tooltips