Fix a panel crash
This commit is contained in:
parent
b37ec40e59
commit
3c0027ccf6
@ -0,0 +1,39 @@
|
|||||||
|
From f96e51db46f2196707c0ea44a46f1d67f9a069d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Larsson <alexl@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
|
||||||
|
|
@ -43,6 +43,9 @@ Patch11: gtk2-remove-connecting-reason.patch
|
|||||||
# https://bugzilla.gnome.org/show_bug.cgi?id=600992
|
# https://bugzilla.gnome.org/show_bug.cgi?id=600992
|
||||||
Patch15: filesystemref.patch
|
Patch15: filesystemref.patch
|
||||||
|
|
||||||
|
# upstream fix
|
||||||
|
Patch16: 0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch
|
||||||
|
|
||||||
BuildRequires: atk-devel >= %{atk_version}
|
BuildRequires: atk-devel >= %{atk_version}
|
||||||
BuildRequires: pango-devel >= %{pango_version}
|
BuildRequires: pango-devel >= %{pango_version}
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
@ -162,6 +165,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
|
|||||||
%patch11 -p1 -b .remove-connecting-reason
|
%patch11 -p1 -b .remove-connecting-reason
|
||||||
#%patch14 -p1 -b .landscape-pdf-print
|
#%patch14 -p1 -b .landscape-pdf-print
|
||||||
%patch15 -p1 -b .filesystemref
|
%patch15 -p1 -b .filesystemref
|
||||||
|
%patch16 -p1 -b .panel-crash
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -400,6 +404,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 15 2010 Matthias Clasen <mclasen@redhat.com> - 2.19.3-2
|
||||||
|
- Fix a CSW issue that leads to panel crashes
|
||||||
|
|
||||||
* Mon Jan 11 2010 Matthias Clasen <mclasen@redhat.com> - 2.19.3-1
|
* Mon Jan 11 2010 Matthias Clasen <mclasen@redhat.com> - 2.19.3-1
|
||||||
- Update to 2.19.3
|
- Update to 2.19.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user