From 32e0cefac3211dc794576ccd7f996855e2e1d713 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 10 Dec 2009 05:55:17 +0000
Subject: [PATCH] Catch more X errors

---
 catch-more-xerrors.patch | 11 +++++++++++
 libxklavier.spec         |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 catch-more-xerrors.patch

diff --git a/catch-more-xerrors.patch b/catch-more-xerrors.patch
new file mode 100644
index 0000000..0aa83b8
--- /dev/null
+++ b/catch-more-xerrors.patch
@@ -0,0 +1,11 @@
+diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors libxklavier-4.0/libxklavier/xklavier_evt.c
+--- libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors	2009-12-10 00:50:24.786868859 -0500
++++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-12-10 00:51:23.563118385 -0500
+@@ -508,6 +508,7 @@ xkl_process_error(Display * dpy, XErrorE
+ 	case BadAccess:
+ 	case BadDrawable:
+ 	case BadWindow:
++	case BadMatch:
+ 		{
+ 			XGetErrorText(evt->display, evt->error_code, buf,
+ 				      sizeof(buf));
diff --git a/libxklavier.spec b/libxklavier.spec
index d537d99..833b278 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-7
+- Catch more X errors
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-6
 - Incorporate upstream fixes for XInput error handling