plugins: Remove a11y-keyboard

This feature is handled by mutter/clutter backends.

https://bugzilla.gnome.org/show_bug.cgi?id=790121

8 files changed, 0 insertions, 962 deletions

diff --git a/configure.ac b/configure.ac
index d04f8b66..e8b3d799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,12 +146,6 @@ dnl ================================================================
 dnl Plugins
 dnl ================================================================
 
-PKG_CHECK_MODULES(A11Y_KEYBOARD,
-		  gtk+-3.0
-		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-		  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
-		  x11)
-
 PKG_CHECK_MODULES(A11Y_SETTINGS,
 		  gio-2.0
 		  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION)
@@ -506,7 +500,6 @@ AC_CONFIG_FILES([
 Makefile
 gnome-settings-daemon/Makefile
 plugins/Makefile
-plugins/a11y-keyboard/Makefile
 plugins/a11y-settings/Makefile
 plugins/clipboard/Makefile
 plugins/color/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 6de38f07..60c414b7 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 enabled_plugins =	\
-	a11y-keyboard	\
 	a11y-settings	\
 	clipboard	\
 	color		\
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
deleted file mode 100644
index e57e8829..00000000
--- a/plugins/a11y-keyboard/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-NULL =
-
-plugin_name = a11y-keyboard
-
-libexec_PROGRAMS = gsd-a11y-keyboard
-
-gsd_a11y_keyboard_SOURCES =			\
-	gsd-a11y-keyboard-manager.h		\
-	gsd-a11y-keyboard-manager.c		\
-	main.c
-
-gsd_a11y_keyboard_CFLAGS =					\
-	-I$(top_srcdir)/gnome-settings-daemon			\
-	-I$(top_builddir)/gnome-settings-daemon			\
-	-I$(top_srcdir)/plugins/common				\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
-	$(PLUGIN_CFLAGS)					\
-	$(A11Y_KEYBOARD_CFLAGS)
-
-gsd_a11y_keyboard_LDADD =					\
-	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-	$(top_builddir)/plugins/common/libcommon.la		\
-	$(A11Y_KEYBOARD_LIBS)
-
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.A11yKeyboard.desktop: $(desktop_in_files) Makefile
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-EXTRA_DIST = 			\
-	$(desktop_in_files)	\
-	$(NULL)
-
-CLEANFILES = 			\
-	$(desktop_DATA)		\
-	$(NULL)
-
-DISTCLEANFILES =		\
-	$(desktop_DATA)		\
-	$(NULL)
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
deleted file mode 100644
index f83438db..00000000
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ /dev/null
@@ -1,839 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <libnotify/notify.h>
-
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBstr.h>
-
-#include "gnome-settings-profile.h"
-#include "gsd-a11y-keyboard-manager.h"
-
-#define KEYBOARD_A11Y_SCHEMA "org.gnome.desktop.a11y.keyboard"
-
-#define GSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerPrivate))
-
-struct GsdA11yKeyboardManagerPrivate
-{
-        guint             start_idle_id;
-        int               xkbEventBase;
-        GdkDeviceManager *device_manager;
-        guint             device_added_id;
-        gboolean          stickykeys_shortcut_val;
-        gboolean          slowkeys_shortcut_val;
-
-        XkbDescRec       *desc;
-
-        GSettings        *settings;
-
-        NotifyNotification *notification;
-};
-
-#define DEFAULT_XKB_SET_CONTROLS_MASK           XkbSlowKeysMask         | \
-                                                XkbBounceKeysMask       | \
-                                                XkbStickyKeysMask       | \
-                                                XkbMouseKeysMask        | \
-                                                XkbMouseKeysAccelMask   | \
-                                                XkbAccessXKeysMask      | \
-                                                XkbAccessXTimeoutMask   | \
-                                                XkbAccessXFeedbackMask  | \
-                                                XkbControlsEnabledMask
-
-
-static void     gsd_a11y_keyboard_manager_class_init  (GsdA11yKeyboardManagerClass *klass);
-static void     gsd_a11y_keyboard_manager_init        (GsdA11yKeyboardManager      *a11y_keyboard_manager);
-static void     gsd_a11y_keyboard_manager_finalize    (GObject             *object);
-static void     set_server_from_gsettings (GsdA11yKeyboardManager *manager);
-
-G_DEFINE_TYPE (GsdA11yKeyboardManager, gsd_a11y_keyboard_manager, G_TYPE_OBJECT)
-
-static gpointer manager_object = NULL;
-
-static void
-device_added_cb (GdkDeviceManager       *device_manager,
-                 GdkDevice              *device,
-                 GsdA11yKeyboardManager *manager)
-{
-        if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
-                set_server_from_gsettings (manager);
-}
-
-static void
-set_devicepresence_handler (GsdA11yKeyboardManager *manager)
-{
-        GdkDeviceManager *device_manager;
-
-        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
-        if (device_manager == NULL)
-                return;
-
-        manager->priv->device_manager = device_manager;
-        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
-                                                           G_CALLBACK (device_added_cb), manager);
-}
-
-static gboolean
-xkb_enabled (GsdA11yKeyboardManager *manager)
-{
-        int opcode, errorBase, major, minor;
-
-        if (!XkbQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                &opcode,
-                                &manager->priv->xkbEventBase,
-                                &errorBase,
-                                &major,
-                               &minor))
-                return FALSE;
-
-        if (!XkbUseExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor))
-                return FALSE;
-
-        return TRUE;
-}
-
-static XkbDescRec *
-get_xkb_desc_rec (GsdA11yKeyboardManager *manager)
-{
-        XkbDescRec *desc;
-        Status      status = Success;
-
-        gdk_error_trap_push ();
-        desc = XkbGetMap (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbAllMapComponentsMask, XkbUseCoreKbd);
-        if (desc != NULL) {
-                desc->ctrls = NULL;
-                status = XkbGetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbAllControlsMask, desc);
-        }
-        gdk_error_trap_pop_ignored ();
-
-        g_return_val_if_fail (desc != NULL, NULL);
-        g_return_val_if_fail (desc->ctrls != NULL, NULL);
-        g_return_val_if_fail (status == Success, NULL);
-
-        return desc;
-}
-
-static int
-get_int (GSettings  *settings,
-         char const *key)
-{
-        int res = g_settings_get_int  (settings, key);
-        if (res <= 0) {
-                res = 1;
-        }
-        return res;
-}
-
-static gboolean
-set_int (GSettings      *settings,
-         char const     *key,
-         int             val)
-{
-        int prev_val;
-
-        prev_val = g_settings_get_int (settings, key);
-        g_settings_set_int (settings, key, val);
-        if (val != prev_val) {
-                g_debug ("%s changed", key);
-        }
-
-        return val != prev_val;
-}
-
-static gboolean
-set_bool (GSettings      *settings,
-          char const     *key,
-          int             val)
-{
-        gboolean bval = (val != 0);
-        gboolean prev_val;
-
-        prev_val = g_settings_get_boolean (settings, key);
-        g_settings_set_boolean (settings, key, bval ? TRUE : FALSE);
-        if (bval != prev_val) {
-                g_debug ("%s changed", key);
-                return TRUE;
-        }
-        return (bval != prev_val);
-}
-
-static unsigned long
-set_clear (gboolean      flag,
-           unsigned long value,
-           unsigned long mask)
-{
-        if (flag) {
-                return value | mask;
-        }
-        return value & ~mask;
-}
-
-static gboolean
-set_ctrl_from_gsettings (XkbDescRec   *desc,
-                         GSettings    *settings,
-                         char const   *key,
-                         unsigned long mask)
-{
-        gboolean result = g_settings_get_boolean (settings, key);
-        desc->ctrls->enabled_ctrls = set_clear (result, desc->ctrls->enabled_ctrls, mask);
-        return result;
-}
-
-static void
-set_server_from_gsettings (GsdA11yKeyboardManager *manager)
-{
-        XkbDescRec      *desc;
-        gboolean         enable_accessX;
-        GSettings       *settings;
-
-        gnome_settings_profile_start (NULL);
-
-        desc = get_xkb_desc_rec (manager);
-        if (!desc) {
-                return;
-        }
-
-        settings = manager->priv->settings;
-
-        /* general */
-        enable_accessX = g_settings_get_boolean (settings, "enable");
-
-        desc->ctrls->enabled_ctrls = set_clear (enable_accessX,
-                                                desc->ctrls->enabled_ctrls,
-                                                XkbAccessXKeysMask);
-
-        if (set_ctrl_from_gsettings (desc, settings, "timeout-enable",
-                                     XkbAccessXTimeoutMask)) {
-                desc->ctrls->ax_timeout = get_int (settings, "disable-timeout");
-                /* disable only the master flag via the server we will disable
-                 * the rest on the rebound without affecting GSettings state
-                 * don't change the option flags at all.
-                 */
-                desc->ctrls->axt_ctrls_mask = XkbAccessXKeysMask | XkbAccessXFeedbackMask;
-                desc->ctrls->axt_ctrls_values = 0;
-                desc->ctrls->axt_opts_mask = 0;
-        }
-
-        desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "feature-state-change-beep"),
-                                             desc->ctrls->ax_options,
-                                             XkbAccessXFeedbackMask | XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
-
-        /* bounce keys */
-        if (set_ctrl_from_gsettings (desc, settings, "bouncekeys-enable", XkbBounceKeysMask)) {
-                desc->ctrls->debounce_delay = get_int (settings, "bouncekeys-delay");
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "bouncekeys-beep-reject"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_BKRejectFBMask);
-        }
-
-        /* mouse keys */
-        if (set_ctrl_from_gsettings (desc, settings, "mousekeys-enable", XkbMouseKeysMask | XkbMouseKeysAccelMask)) {
-                desc->ctrls->mk_interval     = 100;     /* msec between mousekey events */
-                desc->ctrls->mk_curve        = 50;
-
-                /* We store pixels / sec, XKB wants pixels / event */
-                desc->ctrls->mk_max_speed    = get_int (settings, "mousekeys-max-speed") / (1000 / desc->ctrls->mk_interval);
-                if (desc->ctrls->mk_max_speed <= 0)
-                        desc->ctrls->mk_max_speed = 1;
-
-                desc->ctrls->mk_time_to_max = get_int (settings, /* events before max */
-                                                       "mousekeys-accel-time") / desc->ctrls->mk_interval;
-                if (desc->ctrls->mk_time_to_max <= 0)
-                        desc->ctrls->mk_time_to_max = 1;
-
-                desc->ctrls->mk_delay = get_int (settings, /* ms before 1st event */
-                                                 "mousekeys-init-delay");
-        }
-
-        /* slow keys */
-        if (set_ctrl_from_gsettings (desc, settings, "slowkeys-enable", XkbSlowKeysMask)) {
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "slowkeys-beep-press"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_SKPressFBMask);
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "slowkeys-beep-accept"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_SKAcceptFBMask);
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "slowkeys-beep-reject"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_SKRejectFBMask);
-                desc->ctrls->slow_keys_delay = get_int (settings, "slowkeys-delay");
-                /* anything larger than 500 seems to loose all keyboard input */
-                if (desc->ctrls->slow_keys_delay > 500)
-                        desc->ctrls->slow_keys_delay = 500;
-        }
-
-        /* sticky keys */
-        if (set_ctrl_from_gsettings (desc, settings, "stickykeys-enable", XkbStickyKeysMask)) {
-                desc->ctrls->ax_options |= XkbAX_LatchToLockMask;
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "stickykeys-two-key-off"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_TwoKeysMask);
-                desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "stickykeys-modifier-beep"),
-                                                     desc->ctrls->ax_options,
-                                                     XkbAccessXFeedbackMask | XkbAX_StickyKeysFBMask);
-        }
-
-        /* toggle keys */
-        desc->ctrls->ax_options = set_clear (g_settings_get_boolean (settings, "togglekeys-enable"),
-                                             desc->ctrls->ax_options,
-                                             XkbAccessXFeedbackMask | XkbAX_IndicatorFBMask);
-
-        /*
-        g_debug ("CHANGE to : 0x%x", desc->ctrls->enabled_ctrls);
-        g_debug ("CHANGE to : 0x%x (2)", desc->ctrls->ax_options);
-        */
-
-        gdk_error_trap_push ();
-        XkbSetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                        DEFAULT_XKB_SET_CONTROLS_MASK,
-                        desc);
-
-        XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
-
-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop_ignored ();
-
-        gnome_settings_profile_end (NULL);
-}
-
-static void
-ax_response_callback (GsdA11yKeyboardManager *manager,
-                      const char             *action,
-                      guint                   revert_controls_mask,
-                      gboolean                enabled)
-{
-        if (g_strcmp0 (action, "reject") == 0) {
-                /* we're reverting, so we invert sense of 'enabled' flag */
-                g_debug ("cancelling AccessX request");
-                if (revert_controls_mask == XkbStickyKeysMask) {
-                        g_settings_set_boolean (manager->priv->settings,
-                                                "stickykeys-enable",
-                                                !enabled);
-                } else if (revert_controls_mask == XkbSlowKeysMask) {
-                        g_settings_set_boolean (manager->priv->settings,
-                                                "slowkeys-enable",
-                                                !enabled);
-                }
-
-                set_server_from_gsettings (manager);
-        }
-}
-
-static void
-on_notification_closed (NotifyNotification     *notification,
-                        GsdA11yKeyboardManager *manager)
-{
-        g_object_unref (manager->priv->notification);
-        manager->priv->notification = NULL;
-}
-
-static void
-on_slow_keys_action (NotifyNotification     *notification,
-                     const char             *action,
-                     GsdA11yKeyboardManager *manager)
-{
-        g_assert (action != NULL);
-
-        ax_response_callback (manager,
-                              action, XkbSlowKeysMask,
-                              manager->priv->slowkeys_shortcut_val);
-        notify_notification_close (manager->priv->notification, NULL);
-}
-
-static void
-on_sticky_keys_action (NotifyNotification     *notification,
-                       const char             *action,
-                       GsdA11yKeyboardManager *manager)
-{
-        g_assert (action != NULL);
-
-        ax_response_callback (manager,
-                              action, XkbStickyKeysMask,
-                              manager->priv->stickykeys_shortcut_val);
-        notify_notification_close (manager->priv->notification, NULL);
-}
-
-static gboolean
-ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
-                                 gboolean                enabled)
-{
-        gboolean    res;
-        const char *title;
-        const char *message;
-        GError     *error;
-
-        title = enabled ?
-                _("Slow Keys Turned On") :
-                _("Slow Keys Turned Off");
-        message = _("You just held down the Shift key for 8 seconds.  This is the shortcut "
-                    "for the Slow Keys feature, which affects the way your keyboard works.");
-
-        if (manager->priv->notification != NULL) {
-                notify_notification_close (manager->priv->notification, NULL);
-        }
-
-        manager->priv->notification = notify_notification_new (title,
-                                                               message,
-                                                               "preferences-desktop-accessibility-symbolic");
-        notify_notification_set_app_name (manager->priv->notification, _("Universal Access"));
-        notify_notification_set_timeout (manager->priv->notification, 0);
-        notify_notification_set_urgency (manager->priv->notification, NOTIFY_URGENCY_CRITICAL);
-
-        notify_notification_add_action (manager->priv->notification,
-                                        "reject",
-                                        enabled ? _("Turn Off") : _("Turn On"),
-                                        (NotifyActionCallback) on_slow_keys_action,
-                                        manager,
-                                        NULL);
-        notify_notification_add_action (manager->priv->notification,
-                                        "accept",
-                                        enabled ? _("Leave On") : _("Leave Off"),
-                                        (NotifyActionCallback) on_slow_keys_action,
-                                        manager,
-                                        NULL);
-
-        g_signal_connect (manager->priv->notification,
-                          "closed",
-                          G_CALLBACK (on_notification_closed),
-                          manager);
-
-        error = NULL;
-        res = notify_notification_show (manager->priv->notification, &error);
-        if (! res) {
-                g_warning ("GsdA11yKeyboardManager: unable to show notification: %s", error->message);
-                g_error_free (error);
-                notify_notification_close (manager->priv->notification, NULL);
-        }
-
-        return res;
-}
-
-
-static void
-ax_slowkeys_warning_post (GsdA11yKeyboardManager *manager,
-                          gboolean                enabled)
-{
-
-        manager->priv->slowkeys_shortcut_val = enabled;
-        ax_slowkeys_warning_post_bubble (manager, enabled);
-}
-
-static gboolean
-ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
-                                   gboolean                enabled)
-{
-        gboolean    res;
-        const char *title;
-        const char *message;
-        GError     *error;
-
-        title = enabled ?
-                _("Sticky Keys Turned On") :
-                _("Sticky Keys Turned Off");
-        message = enabled ?
-                _("You just pressed the Shift key 5 times in a row.  This is the shortcut "
-                  "for the Sticky Keys feature, which affects the way your keyboard works.") :
-                _("You just pressed two keys at once, or pressed the Shift key 5 times in a row.  "
-                  "This turns off the Sticky Keys feature, which affects the way your keyboard works.");
-
-        if (manager->priv->notification != NULL) {
-                notify_notification_close (manager->priv->notification, NULL);
-        }
-
-        manager->priv->notification = notify_notification_new (title,
-                                                               message,
-                                                               "preferences-desktop-accessibility-symbolic");
-        notify_notification_set_app_name (manager->priv->notification, _("Universal Access"));
-        notify_notification_set_timeout (manager->priv->notification, 0);
-        notify_notification_set_urgency (manager->priv->notification, NOTIFY_URGENCY_CRITICAL);
-
-        notify_notification_add_action (manager->priv->notification,
-                                        "reject",
-                                        enabled ? _("Turn Off") : _("Turn On"),
-                                        (NotifyActionCallback) on_sticky_keys_action,
-                                        manager,
-                                        NULL);
-        notify_notification_add_action (manager->priv->notification,
-                                        "accept",
-                                        enabled ? _("Leave On") : _("Leave Off"),
-                                        (NotifyActionCallback) on_sticky_keys_action,
-                                        manager,
-                                        NULL);
-
-        g_signal_connect (manager->priv->notification,
-                          "closed",
-                          G_CALLBACK (on_notification_closed),
-                          manager);
-
-        error = NULL;
-        res = notify_notification_show (manager->priv->notification, &error);
-        if (! res) {
-                g_warning ("GsdA11yKeyboardManager: unable to show notification: %s", error->message);
-                g_error_free (error);
-                notify_notification_close (manager->priv->notification, NULL);
-        }
-
-        return res;
-}
-
-static void
-ax_stickykeys_warning_post (GsdA11yKeyboardManager *manager,
-                            gboolean                enabled)
-{
-
-        manager->priv->stickykeys_shortcut_val = enabled;
-        ax_stickykeys_warning_post_bubble (manager, enabled);
-}
-
-static void
-set_gsettings_from_server (GsdA11yKeyboardManager *manager)
-{
-        XkbDescRec     *desc;
-        gboolean        changed = FALSE;
-        gboolean        slowkeys_changed;
-        gboolean        stickykeys_changed;
-        GSettings      *settings;
-
-        desc = get_xkb_desc_rec (manager);
-        if (! desc) {
-                return;
-        }
-
-	/* Create a new one, so that only those settings
-	 * are delayed */
-        settings = g_settings_new (KEYBOARD_A11Y_SCHEMA);
-        g_settings_delay (settings);
-
-        /*
-          fprintf (stderr, "changed to : 0x%x\n", desc->ctrls->enabled_ctrls);
-          fprintf (stderr, "changed to : 0x%x (2)\n", desc->ctrls->ax_options);
-        */
-
-        changed |= set_bool (settings,
-                             "enable",
-                             desc->ctrls->enabled_ctrls & XkbAccessXKeysMask);
-
-        changed |= set_bool (settings,
-                             "feature-state-change-beep",
-                             desc->ctrls->ax_options & (XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask));
-        changed |= set_bool (settings,
-                             "timeout-enable",
-                             desc->ctrls->enabled_ctrls & XkbAccessXTimeoutMask);
-        changed |= set_int (settings,
-                            "disable-timeout",
-                            desc->ctrls->ax_timeout);
-
-        changed |= set_bool (settings,
-                             "bouncekeys-enable",
-                             desc->ctrls->enabled_ctrls & XkbBounceKeysMask);
-        changed |= set_int (settings,
-                            "bouncekeys-delay",
-                            desc->ctrls->debounce_delay);
-        changed |= set_bool (settings,
-                             "bouncekeys-beep-reject",
-                             desc->ctrls->ax_options & XkbAX_BKRejectFBMask);
-
-        changed |= set_bool (settings,
-                             "mousekeys-enable",
-                             desc->ctrls->enabled_ctrls & XkbMouseKeysMask);
-        changed |= set_int (settings,
-                            "mousekeys-max-speed",
-                            desc->ctrls->mk_max_speed * (1000 / desc->ctrls->mk_interval));
-        /* NOTE : mk_time_to_max is measured in events not time */
-        changed |= set_int (settings,
-                            "mousekeys-accel-time",
-                            desc->ctrls->mk_time_to_max * desc->ctrls->mk_interval);
-        changed |= set_int (settings,
-                            "mousekeys-init-delay",
-                            desc->ctrls->mk_delay);
-
-        slowkeys_changed = set_bool (settings,
-                                     "slowkeys-enable",
-                                     desc->ctrls->enabled_ctrls & XkbSlowKeysMask);
-        changed |= set_bool (settings,
-                             "slowkeys-beep-press",
-                             desc->ctrls->ax_options & XkbAX_SKPressFBMask);
-        changed |= set_bool (settings,
-                             "slowkeys-beep-accept",
-                             desc->ctrls->ax_options & XkbAX_SKAcceptFBMask);
-        changed |= set_bool (settings,
-                             "slowkeys-beep-reject",
-                             desc->ctrls->ax_options & XkbAX_SKRejectFBMask);
-        changed |= set_int (settings,
-                            "slowkeys-delay",
-                            desc->ctrls->slow_keys_delay);
-
-        stickykeys_changed = set_bool (settings,
-                                       "stickykeys-enable",
-                                       desc->ctrls->enabled_ctrls & XkbStickyKeysMask);
-        changed |= set_bool (settings,
-                             "stickykeys-two-key-off",
-                             desc->ctrls->ax_options & XkbAX_TwoKeysMask);
-        changed |= set_bool (settings,
-                             "stickykeys-modifier-beep",
-                             desc->ctrls->ax_options & XkbAX_StickyKeysFBMask);
-
-        changed |= set_bool (settings,
-                             "togglekeys-enable",
-                             desc->ctrls->ax_options & XkbAX_IndicatorFBMask);
-
-        if (!changed && stickykeys_changed ^ slowkeys_changed) {
-                /*
-                 * sticky or slowkeys has changed, singly, without our intervention.
-                 * 99% chance this is due to a keyboard shortcut being used.
-                 * we need to detect via this hack until we get
-                 *  XkbAXN_AXKWarning notifications working (probable XKB bug),
-                 *  at which time we can directly intercept such shortcuts instead.
-                 * See cb_xkb_event_filter () below.
-                 */
-
-                /* sanity check: are keyboard shortcuts available? */
-                if (desc->ctrls->enabled_ctrls & XkbAccessXKeysMask) {
-                        if (slowkeys_changed) {
-                                ax_slowkeys_warning_post (manager,
-                                                          desc->ctrls->enabled_ctrls & XkbSlowKeysMask);
-                        } else {
-                                ax_stickykeys_warning_post (manager,
-                                                            desc->ctrls->enabled_ctrls & XkbStickyKeysMask);
-                        }
-                }
-        }
-
-        XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
-
-        g_settings_apply (settings);
-        g_object_unref (settings);
-}
-
-static GdkFilterReturn
-cb_xkb_event_filter (GdkXEvent              *xevent,
-                     GdkEvent               *ignored1,
-                     GsdA11yKeyboardManager *manager)
-{
-        XEvent   *xev   = (XEvent *) xevent;
-        XkbEvent *xkbEv = (XkbEvent *) xevent;
-
-        /* 'event_type' is set to zero on notifying us of updates in
-         * response to client requests (including our own) and non-zero
-         * to notify us of key/mouse events causing changes (like
-         * pressing shift 5 times to enable sticky keys).
-         *
-         * We only want to update GSettings when it's in response to an
-         * explicit user input event, so require a non-zero event_type.
-         */
-        if (xev->xany.type == (manager->priv->xkbEventBase + XkbEventCode) &&
-            xkbEv->any.xkb_type == XkbControlsNotify &&
-            xkbEv->ctrls.event_type != 0) {
-                g_debug ("XKB state changed");
-                set_gsettings_from_server (manager);
-        } else if (xev->xany.type == (manager->priv->xkbEventBase + XkbEventCode) &&
-                   xkbEv->any.xkb_type == XkbAccessXNotify) {
-                if (xkbEv->accessx.detail == XkbAXN_AXKWarning) {
-                        g_debug ("About to turn on an AccessX feature from the keyboard!");
-                        /*
-                         * TODO: when XkbAXN_AXKWarnings start working, we need to
-                         * invoke ax_keys_warning_dialog_run here instead of in
-                         * set_gsettings_from_server().
-                         */
-                }
-        }
-
-        return GDK_FILTER_CONTINUE;
-}
-
-static void
-keyboard_callback (GSettings              *settings,
-                   const char             *key,
-                   GsdA11yKeyboardManager *manager)
-{
-        set_server_from_gsettings (manager);
-}
-
-static gboolean
-start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)
-{
-        guint        event_mask;
-
-        g_debug ("Starting a11y_keyboard manager");
-        gnome_settings_profile_start (NULL);
-
-        if (!xkb_enabled (manager))
-                goto out;
-
-        manager->priv->settings = g_settings_new (KEYBOARD_A11Y_SCHEMA);
-        g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
-                          G_CALLBACK (keyboard_callback), manager);
-
-        set_devicepresence_handler (manager);
-
-        /* Get the original configuration from the server */
-        manager->priv->desc = get_xkb_desc_rec (manager);
-
-        event_mask = XkbControlsNotifyMask;
-        event_mask |= XkbAccessXNotifyMask; /* make default when AXN_AXKWarning works */
-
-        /* be sure to init before starting to monitor the server */
-        set_server_from_gsettings (manager);
-
-        XkbSelectEvents (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                         XkbUseCoreKbd,
-                         event_mask,
-                         event_mask);
-
-        gdk_window_add_filter (NULL,
-                               (GdkFilterFunc) cb_xkb_event_filter,
-                               manager);
-
- out:
-        gnome_settings_profile_end (NULL);
-
-        manager->priv->start_idle_id = 0;
-
-        return FALSE;
-}
-
-gboolean
-gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,
-                                 GError                **error)
-{
-        gnome_settings_profile_start (NULL);
-
-        manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_a11y_keyboard_idle_cb, manager);
-        g_source_set_name_by_id (manager->priv->start_idle_id, "[gnome-settings-daemon] start_a11y_keyboard_idle_cb");
-
-        gnome_settings_profile_end (NULL);
-
-        return TRUE;
-}
-
-void
-gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)
-{
-        GsdA11yKeyboardManagerPrivate *p = manager->priv;
-
-        g_debug ("Stopping a11y_keyboard manager");
-
-        if (p->desc != NULL) {
-                XkbDescRec *desc;
-
-                desc = get_xkb_desc_rec (manager);
-                if (desc != NULL) {
-                        if (p->desc->ctrls->enabled_ctrls != desc->ctrls->enabled_ctrls) {
-                                gdk_error_trap_push ();
-                                XkbSetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                                DEFAULT_XKB_SET_CONTROLS_MASK,
-                                                p->desc);
-
-                                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-                                gdk_error_trap_pop_ignored ();
-                        }
-                        XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
-                }
-                XkbFreeKeyboard (p->desc, XkbAllComponentsMask, True);
-                p->desc = NULL;
-        }
-
-        if (p->start_idle_id != 0) {
-                g_source_remove (p->start_idle_id);
-                p->start_idle_id = 0;
-        }
-
-        if (p->device_manager != NULL) {
-                g_signal_handler_disconnect (p->device_manager, p->device_added_id);
-                p->device_manager = NULL;
-        }
-
-        if (p->settings != NULL) {
-                g_signal_handlers_disconnect_by_func (p->settings, keyboard_callback, manager);
-                g_object_unref (p->settings);
-                p->settings = NULL;
-        }
-
-        gdk_window_remove_filter (NULL,
-                                  (GdkFilterFunc) cb_xkb_event_filter,
-                                  manager);
-
-        p->slowkeys_shortcut_val = FALSE;
-        p->stickykeys_shortcut_val = FALSE;
-}
-
-static void
-gsd_a11y_keyboard_manager_class_init (GsdA11yKeyboardManagerClass *klass)
-{
-        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = gsd_a11y_keyboard_manager_finalize;
-
-        notify_init ("gnome-settings-daemon");
-
-        g_type_class_add_private (klass, sizeof (GsdA11yKeyboardManagerPrivate));
-}
-
-static void
-gsd_a11y_keyboard_manager_init (GsdA11yKeyboardManager *manager)
-{
-        manager->priv = GSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager);
-}
-
-static void
-gsd_a11y_keyboard_manager_finalize (GObject *object)
-{
-        GsdA11yKeyboardManager *a11y_keyboard_manager;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_A11Y_KEYBOARD_MANAGER (object));
-
-        a11y_keyboard_manager = GSD_A11Y_KEYBOARD_MANAGER (object);
-
-        g_return_if_fail (a11y_keyboard_manager->priv != NULL);
-
-        gsd_a11y_keyboard_manager_stop (a11y_keyboard_manager);
-
-        G_OBJECT_CLASS (gsd_a11y_keyboard_manager_parent_class)->finalize (object);
-}
-
-GsdA11yKeyboardManager *
-gsd_a11y_keyboard_manager_new (void)
-{
-        if (manager_object != NULL) {
-                g_object_ref (manager_object);
-        } else {
-                manager_object = g_object_new (GSD_TYPE_A11Y_KEYBOARD_MANAGER, NULL);
-                g_object_add_weak_pointer (manager_object,
-                                           (gpointer *) &manager_object);
-        }
-
-        return GSD_A11Y_KEYBOARD_MANAGER (manager_object);
-}
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h
deleted file mode 100644
index d882320e..00000000
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __GSD_A11Y_KEYBOARD_MANAGER_H
-#define __GSD_A11Y_KEYBOARD_MANAGER_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GSD_TYPE_A11Y_KEYBOARD_MANAGER         (gsd_a11y_keyboard_manager_get_type ())
-#define GSD_A11Y_KEYBOARD_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManager))
-#define GSD_A11Y_KEYBOARD_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerClass))
-#define GSD_IS_A11Y_KEYBOARD_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER))
-#define GSD_IS_A11Y_KEYBOARD_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_A11Y_KEYBOARD_MANAGER))
-#define GSD_A11Y_KEYBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerClass))
-
-typedef struct GsdA11yKeyboardManagerPrivate GsdA11yKeyboardManagerPrivate;
-
-typedef struct
-{
-        GObject                     parent;
-        GsdA11yKeyboardManagerPrivate *priv;
-} GsdA11yKeyboardManager;
-
-typedef struct
-{
-        GObjectClass   parent_class;
-} GsdA11yKeyboardManagerClass;
-
-GType                   gsd_a11y_keyboard_manager_get_type            (void);
-
-GsdA11yKeyboardManager *gsd_a11y_keyboard_manager_new                 (void);
-gboolean                gsd_a11y_keyboard_manager_start               (GsdA11yKeyboardManager *manager,
-                                                                       GError                **error);
-void                    gsd_a11y_keyboard_manager_stop                (GsdA11yKeyboardManager *manager);
-
-G_END_DECLS
-
-#endif /* __GSD_A11Y_KEYBOARD_MANAGER_H */
diff --git a/plugins/a11y-keyboard/main.c b/plugins/a11y-keyboard/main.c
deleted file mode 100644
index e17712d2..00000000
--- a/plugins/a11y-keyboard/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#define NEW gsd_a11y_keyboard_manager_new
-#define START gsd_a11y_keyboard_manager_start
-#define STOP gsd_a11y_keyboard_manager_stop
-#define MANAGER GsdA11yKeyboardManager
-#include "gsd-a11y-keyboard-manager.h"
-
-#include "daemon-skeleton-gtk.h"
diff --git a/plugins/a11y-keyboard/org.gnome.SettingsDaemon.A11yKeyboard.desktop.in b/plugins/a11y-keyboard/org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
deleted file mode 100644
index 313777ae..00000000
--- a/plugins/a11y-keyboard/org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's a11y-keyboard plugin
-Exec=@libexecdir@/gsd-a11y-keyboard
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17e740a4..a0d20365 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,6 @@ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
-plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
 plugins/color/gsd-color-calibrate.c
 plugins/color/gsd-color-manager.c
 plugins/datetime/gsd-datetime-manager.c