Re: gnome-settings-daemon patches

[Bastien Nocera <hadess hadess net>]

On Thu, 2011-03-24 at 22:24 -0400, Matthias Clasen wrote:
> On Thu, Mar 24, 2011 at 8:31 PM, Bastien Nocera <hadess hadess net> wrote:
> > The most embarrassing bunch of patches you will ever see.
> >
> > The a11y-settings plugin for gnome-settings-daemon (which monitors the
> > screen reader and On-Screen keyboard settings, and enables loading the
> > ATK GTK+ modules) was completely non-functional. This makes it work as
> > appropriate:
> > https://bugzilla.gnome.org/show_bug.cgi?id=645721
> >
> > Related to this is:
> > https://bugzilla.gnome.org/show_bug.cgi?id=645708
> > which I have no intentions of committing for 3.0, as per bug.
> >
> > Thanks for Frederic for his patience in testing my incomplete patches.
> 
> Can you put the patch somewhere else for us to review ? bz still down :-(

Attached

>From 45b223d5a79aa03ea6861f06326a99cc2197e1d6 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess hadess net>
Date: Thu, 24 Mar 2011 17:02:10 +0000
Subject: [PATCH 1/3] a11y-settings: Enable by default

So that toolkit-accessibility is correctly updated when the
screen reader or on-screen keyboard are enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=645721
---
 ...gnome.settings-daemon.plugins.gschema.xml.in.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index 9b0f7d0..52606cc 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -26,7 +26,7 @@
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.a11y-settings" path="/org/gnome/settings-daemon/plugins/a11y-settings/">
     <key name="active" type="b">
-      <default>false</default>
+      <default>true</default>
       <_summary>Activation of this plugin</_summary>
       <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
     </key>
-- 
1.7.4.1

>From 3936ca9c660be3925fc6d729157d3b9c451ececd Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess hadess net>
Date: Thu, 24 Mar 2011 17:08:34 +0000
Subject: [PATCH 2/3] a11y-settings: Set toolkit-accessibility to on for either

If *either* the on-screen keyboard or the screen reader are
enabled we need to enable "toolkit-accessibility"

https://bugzilla.gnome.org/show_bug.cgi?id=645721
---
 plugins/a11y-settings/gsd-a11y-settings-manager.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/a11y-settings/gsd-a11y-settings-manager.c b/plugins/a11y-settings/gsd-a11y-settings-manager.c
index d594587..07b1f94 100644
--- a/plugins/a11y-settings/gsd-a11y-settings-manager.c
+++ b/plugins/a11y-settings/gsd-a11y-settings-manager.c
@@ -70,13 +70,18 @@ apps_settings_changed (GSettings              *settings,
 	    g_str_equal (key, "screen-keyboard-enabled") == FALSE)
 		return;
 
+	g_debug ("screen reader or OSK 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)
+	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)
+	} 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);
+	}
 }
 
 gboolean
-- 
1.7.4.1

>From a95de626c9187313fc6801cd34342469a5953a8e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess hadess net>
Date: Thu, 24 Mar 2011 18:13:25 +0000
Subject: [PATCH 3/3] a11y-settings: Really install the plugin

https://bugzilla.gnome.org/show_bug.cgi?id=645721
---
 plugins/a11y-settings/Makefile.am |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index f82cf38..03b98d7 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -41,7 +41,3 @@ DISTCLEANFILES =		\
 
 @GSD_INTLTOOL_PLUGIN_RULE@
 
-# override to _not_ install the test plugin
-# do not copy into your plugin
-install-pluginDATA:
-install-pluginLTLIBRARIES:
-- 
1.7.4.1