rpms/gtk2/F-12 0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch, NONE, 1.1 gtk2.spec, 1.445, 1.446

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch 
Log Message:
Avoid a panel crash


0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch:
 gdkwindow.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch ---
>From f96e51db46f2196707c0ea44a46f1d67f9a069d4 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Fri, 15 Jan 2010 16:06:12 +0100
Subject: [PATCH] Avoid drawing implicit paints to destroyed windows

It may happen that a window gets destroyed during painting, if so
we should not draw the implicit paint double-buffered pixmap to it
as that will cause a BadDrawable X error.

This fixes bug 600865
---
 gdk/gdkwindow.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index eeaee78..9e6b14a 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2679,7 +2679,7 @@ gdk_window_flush_implicit_paint (GdkWindow *window)
   gdk_region_offset (region, private->abs_x, private->abs_y);
   gdk_region_intersect (region, paint->region);
 
-  if (!gdk_region_empty (region))
+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (region))
     {
       /* Remove flushed region from the implicit paint */
       gdk_region_subtract (paint->region, region);
@@ -2712,7 +2712,7 @@ gdk_window_end_implicit_paint (GdkWindow *window)
 
   private->implicit_paint = NULL;
 
-  if (!gdk_region_empty (paint->region))
+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (paint->region))
     {
       /* Some regions are valid, push these to window now */
       tmp_gc = _gdk_drawable_get_scratch_gc ((GdkDrawable *)window, FALSE);
-- 
1.6.6



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- gtk2.spec	11 Jan 2010 23:57:07 -0000	1.445
+++ gtk2.spec	15 Jan 2010 16:50:25 -0000	1.446
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -47,6 +47,7 @@ Patch15: filesystemref.patch
 # from upstream
 Patch16: o-minus.patch
 Patch17: strftime-format.patch
+Patch18: 0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -170,6 +171,7 @@ This package contains developer document
 %patch15 -p1 -b .filesystemref
 %patch16 -p1 -b .o-minus
 %patch17 -p1 -b .strftime-format
+%patch18 -p1 -b .panel-crash
 
 %build
 %configure --with-xinput=xfree 		\
@@ -397,6 +399,9 @@ fi
 
 
 %changelog
+* Fri Jan 15 2010 Matthias Clasen <mclasen at redhat.com> - 2.18.6-2
+- Fix a CSW bug that leads to panel crashes
+
 * Mon Jan 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.18.6-1
 - Update to 2.18.6
 - See http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.6.news