[gnome-settings-daemon] a11y-settings: gnome-shell OSK doesn't need a11y

[Bastien Nocera <hadess src gnome org>]

commit c52025fae0bb12c130450211bb9168fc321a707c
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Aug 4 16:49:32 2011 +0100

    a11y-settings: gnome-shell OSK doesn't need a11y
    
    So don't try and load the modules. Only Caribou in
    fallback mode would have needed it. #fallback
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655985

 plugins/a11y-settings/gsd-a11y-settings-manager.c |   23 ++++++--------------
 1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/plugins/a11y-settings/gsd-a11y-settings-manager.c b/plugins/a11y-settings/gsd-a11y-settings-manager.c
index 07b1f94..89964be 100644
--- a/plugins/a11y-settings/gsd-a11y-settings-manager.c
+++ b/plugins/a11y-settings/gsd-a11y-settings-manager.c
@@ -64,24 +64,16 @@ apps_settings_changed (GSettings              *settings,
 		       const char             *key,
 		       GsdA11ySettingsManager *manager)
 {
-	gboolean screen_reader, keyboard;
+	gboolean screen_reader;
 
-	if (g_str_equal (key, "screen-reader-enabled") == FALSE &&
-	    g_str_equal (key, "screen-keyboard-enabled") == FALSE)
+	if (g_str_equal (key, "screen-reader-enabled") == FALSE)
 		return;
 
-	g_debug ("screen reader or OSK enablement changed");
+	g_debug ("screen reader enablement changed");
 
 	screen_reader = g_settings_get_boolean (manager->priv->a11y_apps_settings, "screen-reader-enabled");
-	keyboard = g_settings_get_boolean (manager->priv->a11y_apps_settings, "screen-keyboard-enabled");
-
-	if (screen_reader || keyboard) {
-		g_debug ("Enabling toolkit-accessibility, screen reader or OSK enabled");
-		g_settings_set_boolean (manager->priv->interface_settings, "toolkit-accessibility", TRUE);
-	} else if (screen_reader == FALSE && keyboard == FALSE) {
-		g_debug ("Disabling toolkit-accessibility, screen reader and OSK disabled");
-		g_settings_set_boolean (manager->priv->interface_settings, "toolkit-accessibility", FALSE);
-	}
+	g_debug ("Enabling toolkit-accessibility, screen reader %s", screen_reader ? "enabled" : "disabled");
+	g_settings_set_boolean (manager->priv->interface_settings, "toolkit-accessibility", screen_reader);
 }
 
 gboolean
@@ -97,12 +89,11 @@ gsd_a11y_settings_manager_start (GsdA11ySettingsManager *manager,
 	g_signal_connect (G_OBJECT (manager->priv->a11y_apps_settings), "changed",
 			  G_CALLBACK (apps_settings_changed), manager);
 
-	/* If any of the screen reader or on-screen keyboard are enabled,
+	/* If the screen reader is enabled,
 	 * make sure a11y is enabled for the toolkits.
 	 * We don't do the same thing for the reverse so it's possible to
 	 * enable AT-SPI for the toolkits without using an a11y app */
-	if (g_settings_get_boolean (manager->priv->a11y_apps_settings, "screen-keyboard-enabled") ||
-	    g_settings_get_boolean (manager->priv->a11y_apps_settings, "screen-reader-enabled"))
+	if (g_settings_get_boolean (manager->priv->a11y_apps_settings, "screen-reader-enabled"))
 		g_settings_set_boolean (manager->priv->interface_settings, "toolkit-accessibility", TRUE);
 
         gnome_settings_profile_end (NULL);