Merge lp:~apinheiro/unity/a11y-a11y-always-on into lp:unity

[Alejandro Piñeiro]

a11y: Port unity3d and panel service accessibility init to atk-bridge

https://code.launchpad.net/bugs/1023542

See bug 1023542 for the reasons to do this merge.

After this merge:
  * Accessibility will be initialized using a library call instead of a module (plugin) runtime-load
  * Accessibility would be always on. Take into account that in the last releases of at-spi2-core and at-spi2-atk extra effort was done to not affect the system if no AT (like Orca) is listening. So right now bridge intialized + no AT is listening should be equivalent to not have the bridge initialized (aclaration added for people worried about performance and memory lose).

[Marco Trevisan (Treviño) (3v1n0)]

Once the conflict it's fixed, this is ok for me.

[Alejandro Piñeiro (apinheiro)]

> Once the conflict it's fixed, this is ok for me.

What conflict? Do you mean the new dependency?

[Andrea Azzarone (azzar1)]

> > Once the conflict it's fixed, this is ok for me.
>
> What conflict? Do you mean the new dependency?

8 +<<<<<<< TREE
9
10 set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes")
11
12 +=======
13 +set (UNITY_PLUGIN_DEPS "compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;xfixes")
14 +>>>>>>> MERGE-SOURCE

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

> > > Once the conflict it's fixed, this is ok for me.
> >
> > What conflict? Do you mean the new dependency?
>
> 8 +<<<<<<< TREE
> 9
> 10 set (UNITY_PLUGIN_DEPS
> "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-
> glib-0.4;x11;libstartup-
> notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-
> misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-
> glib-1.0;libnotify;xfixes")
> 11
> 12 +=======
> 13 +set (UNITY_PLUGIN_DEPS
> "compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-
> glib-0.4;x11;libstartup-
> notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-
> misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-
> glib-1.0;libnotify;gnome-desktop-3.0;xfixes")
> 14 +>>>>>>> MERGE-SOURCE

Just in case you didn't notice, I have updated the branch, and solved the conflict.

Sorry for the noise of not realizing that conflict when I uploaded the branch.

[Andrea Azzarone (azzar1)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Thanks, +1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Alejandro Piñeiro (apinheiro)]

> No commit message specified.

Done, sorry AFAIR, this was not required when we just merged manually the branches approved.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in CMakeLists.txt
text conflict in HACKING

[Andrea Azzarone (azzar1)]

Poke ;)

[Alejandro Piñeiro (apinheiro)]

> Poke ;)

Sorry, I missed that poke, I will update this branch as soon as possible.

[Timo Jyrinki (timo-jyrinki)]

Poke^2 ;)

[Andrea Azzarone (azzar1)]

Conflicts solve here: https://code.launchpad.net/~andyrock/unity/a11y-a11y-always-on/+merge/123054

review: Disapprove

[Andrea Azzarone (azzar1)]

*solved

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-07-09 07:51:54 +0000
+++ CMakeLists.txt	2012-07-17 18:40:24 +0000
@@ -133,8 +133,7 @@
 #
 # Compiz Plugins
 #
-
-set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes")
+set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes")
 
 find_package (PkgConfig)
 pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS})

=== modified file 'HACKING'
--- HACKING	2012-06-19 03:34:06 +0000
+++ HACKING	2012-07-17 18:40:24 +0000
@@ -7,6 +7,7 @@
   - gthread-2.0
   - indicator
   - atk
+  - libatk-adaptor
   - libutouch-geis
 
 Or if you are on ubuntu run the command, apt-get build-dep unity

=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp	2012-05-17 19:34:56 +0000
+++ plugins/unityshell/src/unitya11y.cpp	2012-07-17 18:40:24 +0000
@@ -20,6 +20,7 @@
 #include <gio/gio.h>
 #include <gmodule.h>
 #include <stdio.h>
+#include <atk-bridge.h>
 
 #include "unitya11y.h"
 #include "unitya11ytests.h"
@@ -62,12 +63,6 @@
 
 static gboolean a11y_initialized = FALSE;
 
-#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 void
 unity_a11y_restore_environment(void)
 {
@@ -82,101 +77,6 @@
   g_type_class_unref(g_type_class_ref(UNITY_TYPE_UTIL_ACCESSIBLE));
 }
 
-/* This method is required because g_setting_new abort if the schema
-   is not present. */
-static gboolean
-has_gsettings_schema(const gchar* schema)
-{
-  const char* const* list_schemas = NULL;
-  gboolean found = FALSE;
-  int i = 0;
-
-  list_schemas = g_settings_list_schemas();
-  for (i = 0; list_schemas [i]; i++)
-  {
-    if (!g_strcmp0(list_schemas[i], schema))
-    {
-      found = TRUE;
-      break;
-    }
-  }
-
-  return found;
-}
-
-static gboolean
-should_enable_a11y(void)
-{
-  GSettings* desktop_settings = 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);
-
-  return value;
-}
-
-static gchar*
-get_atk_bridge_path(void)
-{
-  GSettings* atspi_settings = NULL;
-  GVariant *variant = NULL;
-  char* value = NULL;
-
-  if (!has_gsettings_schema(AT_SPI_SCHEMA))
-    return NULL;
-
-  atspi_settings = g_settings_new(AT_SPI_SCHEMA);
-  variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
-  value = g_variant_dup_bytestring (variant, NULL);
-
-  g_variant_unref (variant);
-  g_object_unref(atspi_settings);
-
-  return value;
-}
-
-static gboolean
-a11y_invoke_module(const char* module_path)
-{
-  GModule*    handle;
-  void (*invoke_fn)(void);
-
-  if (!module_path)
-  {
-    g_warning("Accessibility: invalid module path (NULL)");
-
-    return FALSE;
-  }
-
-  if (!(handle = g_module_open(module_path, (GModuleFlags)0)))
-  {
-    g_warning("Accessibility: failed to load module '%s': '%s'",
-              module_path, g_module_error());
-
-    return FALSE;
-  }
-
-  if (!g_module_symbol(handle, INIT_METHOD, (gpointer*)&invoke_fn))
-  {
-    g_warning("Accessibility: error library '%s' does not include "
-              "method '%s' required for accessibility support",
-              module_path, INIT_METHOD);
-    g_module_close(handle);
-
-    return FALSE;
-  }
-
-  invoke_fn();
-
-  return TRUE;
-}
-
 /********************************************************************************/
 /*
  * In order to avoid the atk-bridge loading and the GAIL
@@ -194,35 +94,19 @@
 /*
  * Initializes the accessibility (ATK) support on Unity
  *
- * It loads the atk-bridge if required. It checks:
- *  * If the proper gsettings keys are set
- *  * Loads the proper AtkUtil implementation
  */
 void
 unity_a11y_init(nux::WindowThread* wt)
 {
-  gchar* bridge_path = NULL;
+  if (a11y_initialized)
+    return;
 
   unity_a11y_restore_environment();
-
-  if (!should_enable_a11y())
-    return;
-
   load_unity_atk_util(wt);
-
-  bridge_path = get_atk_bridge_path();
-
-  if (a11y_invoke_module(bridge_path))
-  {
-    g_debug("Unity Oneiric accessibility started, using bridge on %s",
-            bridge_path);
-
-    atk_get_root();
-
-    a11y_initialized = TRUE;
-  }
-
-  g_free(bridge_path);
+  atk_bridge_adaptor_init(NULL, NULL);
+  atk_get_root();
+
+  a11y_initialized = TRUE;
 
 // NOTE: we run manually the unit tests while developing by
 // uncommenting this. Take a look to the explanation on

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2012-03-21 12:31:11 +0000
+++ services/CMakeLists.txt	2012-07-17 18:40:24 +0000
@@ -2,7 +2,7 @@
 # Panel Service
 #
 find_package(PkgConfig)
-pkg_check_modules(SERVICE_DEPS REQUIRED gtk+-3.0>=3.3 gobject-2.0 gio-2.0 gthread-2.0 indicator3-0.4>=0.4.90 x11 gconf-2.0)
+pkg_check_modules(SERVICE_DEPS REQUIRED gtk+-3.0>=3.3 gobject-2.0 gio-2.0 gthread-2.0 indicator3-0.4>=0.4.90 x11 gconf-2.0 atk-bridge-2.0)
 
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)

=== modified file 'services/panel-a11y.c'
--- services/panel-a11y.c	2011-09-09 14:04:34 +0000
+++ services/panel-a11y.c	2012-07-17 18:40:24 +0000
@@ -17,119 +17,16 @@
  */
 
 #include <gio/gio.h>
+#include <atk-bridge.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 "toolkit-accessibility"
-#define AT_SPI_SCHEMA "org.a11y.atspi"
-#define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"
-
-
-/* This method is required because g_setting_new abort if the schema
-   is not present. */
-static gboolean
-has_gsettings_schema (const gchar *schema)
-{
-  const char * const *list_schemas = NULL;
-  gboolean found = FALSE;
-  int i = 0;
-
-  list_schemas = g_settings_list_schemas ();
-  for (i = 0; list_schemas [i]; i++)
-    {
-      if (!g_strcmp0 (list_schemas[i], schema))
-        {
-          found = TRUE;
-          break;
-        }
-    }
-
-  return found;
-}
-
-static gboolean
-should_enable_a11y (void)
-{
-  GSettings *desktop_settings = 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);
-
-  return value;
-}
-
-static gchar*
-get_atk_bridge_path (void)
-{
-  GSettings *atspi_settings = NULL;
-  GVariant *variant = NULL;
-  char *value = NULL;
-
-  if (!has_gsettings_schema (AT_SPI_SCHEMA))
-    return NULL;
-
-  atspi_settings = g_settings_new(AT_SPI_SCHEMA);
-  variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
-  value = g_variant_dup_bytestring (variant, NULL);
-
-  g_variant_unref (variant);
-  g_object_unref (atspi_settings);
-
-  return value;
-}
-
-static gboolean
-a11y_invoke_module (const char *module_path)
-{
-  GModule    *handle;
-  void      (*invoke_fn) (void);
-
-  if (!module_path)
-    {
-      g_warning ("Accessibility: invalid module path (NULL)");
-
-      return FALSE;
-    }
-
-  if (!(handle = g_module_open (module_path, (GModuleFlags)0)))
-    {
-      g_warning ("Accessibility: failed to load module '%s': '%s'",
-                 module_path, g_module_error ());
-
-      return FALSE;
-    }
-
-  if (!g_module_symbol (handle, INIT_METHOD, (gpointer *)&invoke_fn))
-    {
-      g_warning ("Accessibility: error library '%s' does not include "
-                 "method '%s' required for accessibility support",
-                 module_path, INIT_METHOD);
-      g_module_close (handle);
-
-      return FALSE;
-    }
-
-  invoke_fn ();
-
-  return TRUE;
-}
-
 void
 panel_a11y_init (void)
 {
-  gchar *bridge_path = NULL;
-
   if (a11y_initialized)
     return;
 
@@ -137,20 +34,9 @@
   g_unsetenv ("NO_AT_BRIDGE");
   g_unsetenv ("NO_GAIL");
 
-  if (!should_enable_a11y ())
-    return;
-
   /* Load PanelUtilAccessible class */
   g_type_class_unref (g_type_class_ref (PANEL_TYPE_UTIL_ACCESSIBLE));
-
-  bridge_path = get_atk_bridge_path ();
-  if (a11y_invoke_module (bridge_path))
-    {
-      g_debug ("Unity accessibility started, using bridge on %s", bridge_path);
-    }
-
-  g_free (bridge_path);
-  atk_get_root ();
+  atk_bridge_adaptor_init(NULL, NULL);
 
   a11y_initialized = TRUE;
 }