gnome-settings-daemon r626 - in trunk: . plugins/mouse
- From: jensg svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-settings-daemon r626 - in trunk: . plugins/mouse
- Date: Thu, 4 Dec 2008 17:35:42 +0000 (UTC)
Author: jensg
Date: Thu Dec 4 17:35:41 2008
New Revision: 626
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=626&view=rev
Log:
2008-12-04 Jens Granseuer <jensgr gmx net>
* plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
fix crash with X servers that don't provide XInput (bug #562977)
Modified:
trunk/ChangeLog
trunk/plugins/mouse/gsd-mouse-manager.c
Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c (original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c Thu Dec 4 17:35:41 2008
@@ -329,10 +329,15 @@
static void
set_devicepresence_handler (GsdMouseManager *manager)
{
- Display *display = gdk_x11_get_default_xdisplay ();
+ Display *display;
XEventClass class_presence;
int xi_presence;
+ if (!supports_xinput_devices ())
+ return;
+
+ display = gdk_x11_get_default_xdisplay ();
+
gdk_error_trap_push ();
DevicePresence (display, xi_presence, class_presence);
XSelectExtensionEvent (display,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]