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

Proposed by Alejandro Piñeiro
Status: Rejected
Rejected by: Andrea Azzarone
Proposed branch: lp://staging/~apinheiro/unity/a11y-a11y-always-on
Merge into: lp://staging/unity
Diff against target: 354 lines (+12/-242)
5 files modified
CMakeLists.txt (+1/-2)
HACKING (+1/-0)
plugins/unityshell/src/unitya11y.cpp (+7/-123)
services/CMakeLists.txt (+1/-1)
services/panel-a11y.c (+2/-116)
To merge this branch: bzr merge lp://staging/~apinheiro/unity/a11y-a11y-always-on
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Disapprove
Marco Trevisan (Treviño) Approve
Alex Launi Pending
Review via email: mp+114479@code.staging.launchpad.net

Commit message

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

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

Description of the change

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).

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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

Revision history for this message
Alejandro Piñeiro (apinheiro) wrote :

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

What conflict? Do you mean the new dependency?

Revision history for this message
Andrea Azzarone (azzar1) wrote :

> > 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
Revision history for this message
Alejandro Piñeiro (apinheiro) wrote :

> > > 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.

Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks, +1

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Alejandro Piñeiro (apinheiro) wrote :

> No commit message specified.

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

Revision history for this message
Unity Merger (unity-merger) wrote :

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

text conflict in CMakeLists.txt
text conflict in HACKING

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Poke ;)

Revision history for this message
Alejandro Piñeiro (apinheiro) wrote :

> Poke ;)

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Poke^2 ;)

Revision history for this message
Andrea Azzarone (azzar1) wrote :
review: Disapprove
Revision history for this message
Andrea Azzarone (azzar1) wrote :

*solved

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.