From f753b494e8640cd9cddd93eb74124fc61411b2aa Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Oct 18 2007 01:27:17 +0000
Subject: - Fix crash in keymouselistener plugin to address part two of bug 246399


---

diff --git a/gdm-2.20.1-keymouselistener-segfault.patch b/gdm-2.20.1-keymouselistener-segfault.patch
new file mode 100644
index 0000000..fea1bef
--- /dev/null
+++ b/gdm-2.20.1-keymouselistener-segfault.patch
@@ -0,0 +1,21 @@
+diff -up gdm-2.20.1/gui/modules/keymouselistener.c.keymouselistener-segfault gdm-2.20.1/gui/modules/keymouselistener.c
+--- gdm-2.20.1/gui/modules/keymouselistener.c.keymouselistener-segfault	2007-10-17 20:33:49.000000000 -0400
++++ gdm-2.20.1/gui/modules/keymouselistener.c	2007-10-17 21:07:58.000000000 -0400
+@@ -158,13 +158,16 @@ init_xinput (GdkDisplay *display, GdkWin
+ {
+ #ifdef HAVE_XINPUT
+ 	XEventClass  event_list[40];
+-	int          i, j, number = 0, num_devices; 
++	int          i, j, number = 0, num_devices = 0; 
+ 	XDeviceInfo  *devices = NULL;
+ 	XDevice      *device = NULL;
+ 
+ 	devices = XListInputDevices (GDK_DISPLAY_XDISPLAY (display),
+ 		&num_devices);
+ 
++        if (devices == NULL)
++            return;
++
+ 	if (debug_gestures)
+ 	    syslog (LOG_WARNING, "checking %d input devices...", num_devices);
+ 
diff --git a/gdm.spec b/gdm.spec
index 7ddd5a1..bee5afb 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,7 +17,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -78,6 +78,9 @@ Patch37: gdm-2.18.0-hide-disabled-users.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=457998
 Patch38: gdm-2.18.0-dont-warp-pointer-to-stylus.patch
 
+# http://bugzilla.redhat.com/show_bug.cgi?id=246399
+Patch39: gdm-2.20.1-keymouselistener-segfault.patch
+
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234567
 Patch99: gdm-2.18.0-be-more-verbose.patch
 
@@ -394,6 +397,10 @@ fi
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Oct 17 2007 Ray Strode <rstrode@redhat.com> - 1:2.18.4-4
+- Fix crash in keymouselistener plugin to address part two of
+  bug 246399
+
 * Tue Aug 21 2007 Ray Strode <rstrode@redhat.com> - 1:2.18.4-3
 - write utmp entry at login (bug 247987)