rpms/libxklavier/F-12 xklavier-handle-baddrawable.patch, NONE, 1.1 libxklavier.spec, 1.52, 1.53

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	libxklavier.spec 
Added Files:
	xklavier-handle-baddrawable.patch 
Log Message:
Bad Drawable


xklavier-handle-baddrawable.patch:
 xklavier_evt.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xklavier-handle-baddrawable.patch ---
diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable libxklavier-4.0/libxklavier/xklavier_evt.c
--- libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable	2009-10-02 22:31:01.074772988 -0400
+++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-10-02 22:31:35.755551422 -0400
@@ -476,6 +476,7 @@ xkl_process_error(Display * dpy, XErrorE
 
 	switch (evt->error_code) {
 	case BadWindow:
+	case BadDrawable:
 	case BadAccess:
 		{
 			XGetErrorText(evt->display, evt->error_code, buf,


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/F-12/libxklavier.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libxklavier.spec	25 Jul 2009 08:58:13 -0000	1.52
+++ libxklavier.spec	3 Oct 2009 02:38:44 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -16,6 +16,8 @@ Source: http://download.gnome.org/source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24285
+Patch1: xklavier-handle-baddrawable.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-5
+- Handle BadDrawable errors gracefully
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild