Merge lp:~themuso/unity/move-present-environment-call into lp:unity

[Luke Yelavich]

Move the unity a11y present environment call

With this change, one can now use accerciser to explore Unity's accessibility object hierarchy again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3922
http://jenkins.qa.ubuntu.com/job/unity-ci/1158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1158/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-02-03 10:47:59 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-02-20 04:55:17 +0000
@@ -271,8 +271,6 @@
   {
      notify_init("unityshell");
 
-     unity_a11y_preset_environment();
-
      XSetErrorHandler(old_handler);
 
      /* Wrap compiz interfaces */
@@ -4516,6 +4514,8 @@
   if (!CompPlugin::checkPluginABI("opengl", COMPIZ_OPENGL_ABI))
     return false;
 
+  unity_a11y_preset_environment();
+
   /*
    * GTK needs to be initialized or else unity's gdk/gtk calls will crash.
    * This is already done in compiz' main() if using ubuntu packages, but not