[gnome-settings-daemon] a11y-keyboard: don't restore settings at logout

[Ryan Lortie <ryanl src gnome org>]

commit 0912d3235db73a1e206dc2084fa3abccea6f8114
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jan 19 11:43:30 2012 -0500

    a11y-keyboard: don't restore settings at logout
    
    The a11y-keyboard plugin goes to some efforts to record the original
    state of the X server and restore it on exit.  It's pretty pointless to
    restore the settings of an X server that is just about to die, so stop
    doing that.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668284

 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |   37 ---------------------
 1 files changed, 0 insertions(+), 37 deletions(-)
---
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
index 939dcc2..1f94d50 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
@@ -62,7 +62,6 @@ struct GsdA11yKeyboardManagerPrivate
         GtkWidget        *slowkeys_alert;
         GtkWidget        *preferences_dialog;
         GtkStatusIcon    *status_icon;
-        XkbDescRec       *original_xkb_desc;
 
         GSettings        *settings;
 
@@ -948,10 +947,6 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)
 
         set_devicepresence_handler (manager);
 
-        /* Save current xkb state so we can restore it on exit
-         */
-        manager->priv->original_xkb_desc = get_xkb_desc_rec (manager);
-
         event_mask = XkbControlsNotifyMask;
         event_mask |= XkbAccessXNotifyMask; /* make default when AXN_AXKWarning works */
 
@@ -990,34 +985,6 @@ gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,
         return TRUE;
 }
 
-static void
-restore_server_xkb_config (GsdA11yKeyboardManager *manager)
-{
-        if (manager->priv->original_xkb_desc == NULL) {
-                return;
-        }
-        gdk_error_trap_push ();
-        XkbSetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                        XkbSlowKeysMask         |
-                        XkbBounceKeysMask       |
-                        XkbStickyKeysMask       |
-                        XkbMouseKeysMask        |
-                        XkbMouseKeysAccelMask   |
-                        XkbAccessXKeysMask      |
-                        XkbAccessXTimeoutMask   |
-                        XkbAccessXFeedbackMask  |
-                        XkbControlsEnabledMask,
-                        manager->priv->original_xkb_desc);
-
-        XkbFreeKeyboard (manager->priv->original_xkb_desc,
-                         XkbAllComponentsMask, True);
-
-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop_ignored ();
-
-        manager->priv->original_xkb_desc = NULL;
-}
-
 void
 gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)
 {
@@ -1050,10 +1017,6 @@ gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)
                                   (GdkFilterFunc) cb_xkb_event_filter,
                                   manager);
 
-        /* Disable all the AccessX bits
-         */
-        restore_server_xkb_config (manager);
-
         if (p->slowkeys_alert != NULL) {
                 gtk_widget_destroy (p->slowkeys_alert);
                 p->slowkeys_alert = NULL;