and here's the patch

3 files changed, 18 insertions, 73 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4127e5f71a68..3c1aebd0f2ca 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -8,7 +8,7 @@ MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1 64
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 a4959dbeffec4104260bc308b085c949 files/gtk+-2.2.2-revert_gtkwidget.patch 2190
+MD5 60abaa583c04f16be6d0703cc9684e45 files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch 757
 MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
diff --git a/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch b/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch
new file mode 100644
index 000000000000..0913c7e89453
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch
@@ -0,0 +1,17 @@
+diff -ur gtk+-2.2.2/gtk/gtkwidget.c gtk+-2.2.2.patched/gtk/gtkwidget.c
+--- gtk+-2.2.2/gtk/gtkwidget.c	2003-06-09 03:54:48.000000000 +0200
++++ gtk+-2.2.2.patched/gtk/gtkwidget.c	2003-06-16 00:14:23.000000000 +0200
+@@ -3041,6 +3041,13 @@
+ static gboolean
+ event_window_is_still_viewable (GdkEvent *event)
+ {
++   /* Some programs, such as gnome-theme-manager, fake widgets
++   * into exposing onto a pixmap by sending expose events with
++   * event->window pointing to a pixmap
++   */
++  if (GDK_IS_PIXMAP (event->any.window))
++    return event->type == GDK_EXPOSE;
++
+   /* Check that we think the event's window is viewable before
+    * delivering the event, to prevent suprises. We do this here
+    * at the last moment, since the event may have been queued
diff --git a/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch b/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch
deleted file mode 100644
index 653502656fc2..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.2.2-revert_gtkwidget.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- gtk+-2.2.2/gtk/gtkwidget.c	2003-06-09 03:54:48.000000000 +0200
-+++ gtk+-2.2.1/gtk/gtkwidget.c	2002-12-19 00:45:51.000000000 +0100
-@@ -463,7 +463,7 @@
-  							 FALSE,
-  							 G_PARAM_READWRITE));
-   g_object_class_install_property (gobject_class,
--				   PROP_IS_FOCUS,
-+				   PROP_HAS_FOCUS,
- 				   g_param_spec_boolean ("is_focus",
-  							 _("Is focus"),
-  							 _("Whether the widget is the focus widget within the toplevel"),
-@@ -3038,60 +3038,12 @@
-   return gtk_widget_event_internal (widget, event);
- }
- 
--static gboolean
--event_window_is_still_viewable (GdkEvent *event)
--{
--  /* Check that we think the event's window is viewable before
--   * delivering the event, to prevent suprises. We do this here
--   * at the last moment, since the event may have been queued
--   * up behind other events, held over a recursive main loop, etc.
--   */
--  switch (event->type)
--    {
--    case GDK_EXPOSE:
--    case GDK_MOTION_NOTIFY:
--    case GDK_BUTTON_PRESS:
--    case GDK_2BUTTON_PRESS:
--    case GDK_3BUTTON_PRESS:
--    case GDK_KEY_PRESS:
--    case GDK_ENTER_NOTIFY:
--    case GDK_PROXIMITY_IN:
--    case GDK_SCROLL:
--      return event->any.window && gdk_window_is_viewable (event->any.window);
--
--#if 0
--    /* The following events are the second half of paired events;
--     * we always deliver them to deal with widgets that clean up
--     * on the second half.
--     */
--    case GDK_BUTTON_RELEASE:
--    case GDK_KEY_RELEASE:
--    case GDK_LEAVE_NOTIFY:
--    case GDK_PROXIMITY_OUT:
--#endif      
--      
--    default:
--      /* Remaining events would make sense on an not-viewable window,
--       * or don't have an associated window.
--       */
--      return TRUE;
--    }
--}
--
- static gint
- gtk_widget_event_internal (GtkWidget *widget,
- 			   GdkEvent  *event)
- {
-   gboolean return_val = FALSE;
- 
--  /* We check only once for is-still-visible; if someone
--   * hides the window in on of the signals on the widget,
--   * they are responsible for returning TRUE to terminate
--   * handling.
--   */
--  if (!event_window_is_still_viewable (event))
--    return TRUE;
--
-   g_object_ref (widget);
- 
-   g_signal_emit (widget, widget_signals[EVENT], 0, event, &return_val);