Merge lp:~apinheiro/unity/Bug723699 into lp:unity

[Alejandro Piñeiro]

[Rodrigo Moya (rodrigo-moya)]

Looks good

review: Approve

[David Barth (dbarth)]

LGTM

review: Approve

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2011-02-17 13:03:25 +0000
+++ services/CMakeLists.txt	2011-02-23 17:33:03 +0000
@@ -2,7 +2,7 @@
 # Panel Service
 #
 find_package(PkgConfig)
-pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator x11)
+pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator x11 gconf-2.0)
 
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
 
=== modified file 'services/panel-a11y.c'
--- services/panel-a11y.c	2011-01-30 17:46:02 +0000
+++ services/panel-a11y.c	2011-02-23 17:33:03 +0000
@@ -16,15 +16,16 @@
  * Authored by: Rodrigo Moya <[e-mail]>
  */
 
+#include <gconf/gconf-client.h>
 #include <gio/gio.h>
+
 #include "panel-a11y.h"
 #include "panel-util-accessible.h"
 
 static gboolean a11y_initialized = FALSE;
 
 #define INIT_METHOD "gnome_accessibility_module_init"
-#define DESKTOP_SCHEMA "org.gnome.desktop.interface"
-#define ACCESSIBILITY_ENABLED_KEY "accessibility"
+#define A11Y_GCONF_KEY "/desktop/gnome/interface/accessibility"
 #define AT_SPI_SCHEMA "org.a11y.atspi"
 #define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"
 
@@ -53,16 +54,19 @@
 static gboolean
 should_enable_a11y (void)
 {
-  GSettings *desktop_settings = NULL;
+  GConfClient *client = NULL;
   gboolean value = FALSE;
-
-  if (!has_gsettings_schema (DESKTOP_SCHEMA))
-    return FALSE;
-
-  desktop_settings = g_settings_new (DESKTOP_SCHEMA);
-  value = g_settings_get_boolean (desktop_settings, ACCESSIBILITY_ENABLED_KEY);
-
-  g_object_unref (desktop_settings);
+  GError *error = NULL;
+
+  client = gconf_client_get_default ();
+  value = gconf_client_get_bool (client, A11Y_GCONF_KEY, &error);
+  if (error != NULL)
+    {
+      g_warning ("Error getting gconf variable %s, a11y disabled by default",
+                 A11Y_GCONF_KEY);
+      g_error_free (error);
+    }
+  g_object_unref (client);
 
   return value;
 }
 
=== modified file 'src/unitya11y.cpp'
--- src/unitya11y.cpp	2011-02-23 12:03:48 +0000
+++ src/unitya11y.cpp	2011-02-23 17:33:03 +0000
@@ -20,6 +20,7 @@
 #include <gio/gio.h>
 #include <gmodule.h>
 #include <stdio.h>
+#include <gconf/gconf-client.h>
 
 #include "unitya11y.h"
 #include "unity-util-accessible.h"
@@ -43,6 +44,11 @@
 
 static gboolean a11y_initialized = FALSE;
 
+#define INIT_METHOD "gnome_accessibility_module_init"
+#define A11Y_GCONF_KEY "/desktop/gnome/interface/accessibility"
+#define AT_SPI_SCHEMA "org.a11y.atspi"
+#define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"
+
 static void
 unity_a11y_restore_environment (void)
 {
@@ -56,12 +62,6 @@
   g_type_class_unref (g_type_class_ref (UNITY_TYPE_UTIL_ACCESSIBLE));
 }
 
-#define INIT_METHOD "gnome_accessibility_module_init"
-#define DESKTOP_SCHEMA "org.gnome.desktop.interface"
-#define ACCESSIBILITY_ENABLED_KEY "toolkit-accessibility"
-#define AT_SPI_SCHEMA "org.a11y.atspi"
-#define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"
-
 static gboolean
 has_gsettings_schema (const gchar *schema)
 {
@@ -87,19 +87,19 @@
 static gboolean
 should_enable_a11y (void)
 {
-  GSettings *desktop_settings = NULL;
+  GConfClient *client = NULL;
   gboolean value = FALSE;
-
-  if (g_getenv ("UNITY_A11Y_DISABLE"))
-    return FALSE;
-
-  if (!has_gsettings_schema (DESKTOP_SCHEMA))
-    return FALSE;
-   
-  desktop_settings = g_settings_new (DESKTOP_SCHEMA);
-  value = g_settings_get_boolean (desktop_settings, ACCESSIBILITY_ENABLED_KEY);
-
-  g_object_unref (desktop_settings);
+  GError *error = NULL;
+
+  client = gconf_client_get_default ();
+  value = gconf_client_get_bool (client, A11Y_GCONF_KEY, &error);
+  if (error != NULL)
+    {
+      g_warning ("Error getting gconf variable %s, a11y disabled by default",
+                 A11Y_GCONF_KEY);
+      g_error_free (error);
+    }
+  g_object_unref (client);
 
   return value;
 }
@@ -355,11 +355,6 @@
 
   unity_a11y_restore_environment ();
 
-  /* FIXME: gsettings is causing some crashes checking if a11y is
-     enabled, so we are move to gconf, meanwhile we require a sanity
-     commit. */
-  return;
-
   if (!should_enable_a11y ())
     return;