gnome-settings-daemon r589 - in trunk: . plugins/keyboard

[jensg svn gnome org]

Author: jensg
Date: Wed Nov  5 17:32:21 2008
New Revision: 589
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=589&view=rev

Log:
2008-11-05  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-manager.c: (numlock_xkb_init):
	XkbQueryExtension and friends shouldn't cause errors, so no need to
	try and trap them (bug #559346)


Modified:
   trunk/ChangeLog
   trunk/plugins/keyboard/gsd-keyboard-manager.c

Modified: trunk/plugins/keyboard/gsd-keyboard-manager.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-manager.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-manager.c	Wed Nov  5 17:32:21 2008
@@ -165,7 +165,6 @@
         gboolean have_xkb;
         int opcode, error_base, major, minor;
 
-        gdk_error_trap_push ();
         have_xkb = XkbQueryExtension (dpy,
                                       &opcode,
                                       &manager->priv->xkb_event_base,
@@ -184,9 +183,6 @@
                 g_warning ("XKB extension not available");
         }
 
-        XSync (dpy, FALSE);
-        gdk_error_trap_pop ();
-
         manager->priv->have_xkb = have_xkb;
 }