Unity 8

Merge lp://staging/~nick-dedekind/unity8/lp1236249 into lp://staging/unity8

lp1236249
Merge into trunk

Proposed by Nick Dedekind on 2013-10-11

Status:

Merged

Merged at revision:

447

Proposed branch:

lp://staging/~nick-dedekind/unity8/lp1236249

Merge into:

lp://staging/unity8

Diff against target:

140 lines (+79/-1)

4 files modified

plugins/Unity/Indicators/rootactionstate.cpp (+15/-1)
plugins/Unity/Indicators/rootactionstate.h (+1/-0)
tests/plugins/Unity/Indicators/CMakeLists.txt (+5/-0)
tests/plugins/Unity/Indicators/rootactionstatetest.cpp (+58/-0)

To merge this branch:

bzr merge lp://staging/~nick-dedekind/unity8/lp1236249

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-10-11
Michael Terry		2013-10-11	Needs Fixing on 2013-10-11
Review via email: mp+190687@code.staging.launchpad.net

Commit message

Only use the root action state as a unitymenumodel ActionStateParser when needed.

Description of the change

Only use the root action state as a unitymenumodel ActionStateParser when needed.
Removes issue where object is destroyed before menu.

Added tests.

lp://staging/~nick-dedekind/unity8/lp1236249 updated on 2013-10-11

416. By Nick Dedekind on 2013-10-11: Only use the parser when needed.

Revision history for this message

Michael Terry (mterry) wrote on 2013-10-11:

A couple style comments:

17 +void RootActionState::reset() {

Brace should be on new line.

27 if (m_menu && m_menu->rowCount() > 0) {
28 +
29 + ActionStateParser* oldParser = m_menu->actionStateParser();

We can drop the extra new line.

review: Needs Fixing

lp://staging/~nick-dedekind/unity8/lp1236249 updated on 2013-10-11

417. By Nick Dedekind on 2013-10-11: fixed style

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-10-11:

> A couple style comments:
>
> 17 +void RootActionState::reset() {
>
> Brace should be on new line.
>
> 27 if (m_menu && m_menu->rowCount() > 0) {
> 28 +
> 29 + ActionStateParser* oldParser = m_menu->actionStateParser();
>
> We can drop the extra new line.

Thanks.
Fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-11: