2008-11-06  Jens Granseuer  <...>

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

I also had common/ in mind:

diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 3778053..cdb7605 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -169,7 +169,6 @@ have_xkb (Display *dpy)
 #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 @@ have_xkb (Display *dpy)
                                              &major,
                                              &minor)
                        && XkbUseExtension (dpy, &major, &minor);
-               gdk_error_trap_pop ();
 #else
                have_xkb = 0;
 #endif

Go ahead.

Created attachment 122136 [details] [review]
Remove XSync after XkbGetMap as that function is synchronous according to docs

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)