gnome-settings-daemon r594 - in trunk: . plugins/a11y-keyboard plugins/common

[behdad svn gnome org]

Author: behdad
Date: Thu Nov  6 19:42:44 2008
New Revision: 594
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=594&view=rev

Log:
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)

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

Modified: trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
==============================================================================
--- trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(original)
+++ trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	Thu Nov  6 19:42:44 2008
@@ -127,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);

Modified: trunk/plugins/common/gsd-keygrab.c
==============================================================================
--- trunk/plugins/common/gsd-keygrab.c	(original)
+++ trunk/plugins/common/gsd-keygrab.c	Thu Nov  6 19:42:44 2008
@@ -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