Unity

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

  1. Bug851103
  2. Merge into trunk
Proposed by Alejandro Piñeiro
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 1571
Proposed branch: lp:~apinheiro/unity/Bug851103
Merge into: lp:unity
Diff against target: 25 lines (+4/-1)
2 files modified
plugins/unityshell/src/LauncherIcon.cpp (+2/-0)
plugins/unityshell/src/LauncherIcon.h (+2/-1)
To merge this branch: bzr merge lp:~apinheiro/unity/Bug851103
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Alex Launi Pending
Review via email: mp+75591@code.launchpad.net

Description of the change

a11y support depends heavily on the NUX type system. It seems that recently someone worked on the LauncherIcon (probably to split it to AbstractLauncherIcon) and it didn't add the NUX_DECLARE/IMPLEMENT macros. Any nux object with an accessibility object requires to have those macros properly set.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
2--- plugins/unityshell/src/LauncherIcon.cpp 2011-09-13 22:06:17 +0000
3+++ plugins/unityshell/src/LauncherIcon.cpp 2011-09-15 17:54:34 +0000
4@@ -59,6 +59,8 @@
5 nux::logging::Logger logger("unity.launcher");
6 }
7
8+NUX_IMPLEMENT_OBJECT_TYPE(LauncherIcon);
9+
10 nux::Tooltip* LauncherIcon::_current_tooltip = 0;
11 QuicklistView* LauncherIcon::_current_quicklist = 0;
12
13
14=== modified file 'plugins/unityshell/src/LauncherIcon.h'
15--- plugins/unityshell/src/LauncherIcon.h 2011-09-13 22:06:17 +0000
16+++ plugins/unityshell/src/LauncherIcon.h 2011-09-15 17:54:34 +0000
17@@ -50,7 +50,8 @@
18
19 class LauncherIcon : public AbstractLauncherIcon, public unity::Introspectable
20 {
21-
22+ NUX_DECLARE_OBJECT_TYPE(LauncherIcon, AbstractLauncherIcon);
23+
24 public:
25 typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
26