File gsd-speed-keyboard.diff of Package gnome-settings-daemon

Index: plugins/common/gsd-keygrab.c
===================================================================
--- a/plugins/common/gsd-keygrab.c	(revision 592)
+++ b/plugins/common/gsd-keygrab.c	(revision 594)
@@ -169,7 +169,6 @@
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
 		int opcode, error_base, major, minor, xkb_event_base;
 
-		gdk_error_trap_push ();
 		have_xkb = XkbQueryExtension (dpy,
 					      &opcode,
 					      &xkb_event_base,
@@ -177,7 +176,6 @@
 					      &major,
 					      &minor)
 			&& XkbUseExtension (dpy, &major, &minor);
-		gdk_error_trap_pop ();
 #else
 		have_xkb = 0;
 #endif
Index: plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
===================================================================
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(revision 592)
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(revision 594)
@@ -104,7 +104,6 @@
         gboolean have_xkb;
         int opcode, errorBase, major, minor;
 
-        gdk_error_trap_push ();
         have_xkb = XkbQueryExtension (GDK_DISPLAY (),
                                       &opcode,
                                       &manager->priv->xkbEventBase,
@@ -112,8 +111,6 @@
                                       &major,
                                       &minor)
                 && XkbUseExtension (GDK_DISPLAY (), &major, &minor);
-        XSync (GDK_DISPLAY (), FALSE);
-        gdk_error_trap_pop ();
 
         return have_xkb;
 }
@@ -130,7 +127,6 @@
                 desc->ctrls = NULL;
                 status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
         }
-        XSync (GDK_DISPLAY (), FALSE);
         gdk_error_trap_pop ();
 
         g_return_val_if_fail (desc != NULL, NULL);
@@ -1036,15 +1032,11 @@
         set_server_from_gconf (manager, client);
         g_object_unref (client);
 
-        gdk_error_trap_push ();
         XkbSelectEvents (GDK_DISPLAY (),
                          XkbUseCoreKbd,
                          event_mask,
                          event_mask);
 
-        XSync (GDK_DISPLAY (), FALSE);
-        gdk_error_trap_pop ();
-
         gdk_window_add_filter (NULL,
                                (GdkFilterFunc) cb_xkb_event_filter,
                                manager);

2008-11-06  Behdad Esfahbod  <behdad@gnome.org>

	* plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
	(get_xkb_desc_rec):
	* plugins/common/gsd-keygrab.c (have_xkb):
	Remove more unnecessary X error traps and synchs (bug #559562)

2008-11-06  Jens Granseuer  <jensgr@gmx.net>

	* plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c: (xkb_enabled),
	(gsd_a11y_keyboard_manager_start): remove unnecessary X error traps
	(bug #559562)


Index: plugins/keyboard/gsd-keyboard-manager.c
===================================================================
--- a/plugins/keyboard/gsd-keyboard-manager.c	(revision 587)
+++ b/plugins/keyboard/gsd-keyboard-manager.c	(revision 589)
@@ -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;
 }
 
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)