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

[jensg svn gnome org]

Author: jensg
Date: Thu Nov  6 17:34:39 2008
New Revision: 593
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=593&view=rev

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


Modified:
   trunk/ChangeLog
   trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.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 17:34:39 2008
@@ -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;
 }
@@ -1036,15 +1033,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);