Add 20081002-1.

[ion3.git] / debian / patches / 102_ignore-bad-match.diff

diff --git a/debian/patches/102_ignore-bad-match.diff b/debian/patches/102_ignore-bad-match.diff
deleted file mode 100644 (file)
index 7c2a55f..0000000
--- a/debian/patches/102_ignore-bad-match.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Wed Jul 23 17:54:17 BST 2008  Tuomo Valkonen <tuomov@iki.fi>
-  * More BadMatch ignore
-diff -rN -u old-ion-3plus/ioncore/rootwin.c new-ion-3plus/ioncore/rootwin.c
---- old-ion-3plus/ioncore/rootwin.c    2008-07-24 21:28:52.000000000 +0100
-+++ new-ion-3plus/ioncore/rootwin.c    2008-07-24 21:28:52.000000000 +0100
-@@ -59,9 +59,13 @@
-     
-     /* Just ignore bad window and similar errors; makes the rest of
-      * the code simpler.
-+     * 
-+     * Apparently XGetWindowProperty can return BadMatch on a race
-+     * condition where the server is already reusing the XID for a 
-+     * non-window drawable, so let's just ignore BadMatch entirely...
-      */
-     if((ev->error_code==BadWindow ||
--        (ev->error_code==BadMatch && ev->request_code==X_SetInputFocus) ||
-+        (ev->error_code==BadMatch /*&& ev->request_code==X_SetInputFocus*/) ||
-         (ev->error_code==BadDrawable && ev->request_code==X_GetGeometry)) &&
-        ignore_badwindow)
-         return 0;
-