Unity

Merge lp://qastaging/~3v1n0/unity/launcher-icon-construction-type into lp://qastaging/unity

  1. launcher-icon-construction-type
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2553
Proposed branch: lp://qastaging/~3v1n0/unity/launcher-icon-construction-type
Merge into: lp://qastaging/unity
Diff against target: 386 lines (+28/-44)
19 files modified
launcher/AbstractLauncherIcon.h (+1/-1)
launcher/BFBLauncherIcon.cpp (+1/-2)
launcher/BamfLauncherIcon.cpp (+1/-2)
launcher/DesktopLauncherIcon.cpp (+1/-2)
launcher/DeviceLauncherIcon.cpp (+1/-2)
launcher/HudLauncherIcon.cpp (+1/-2)
launcher/LauncherController.cpp (+1/-2)
launcher/LauncherIcon.cpp (+4/-10)
launcher/LauncherIcon.h (+4/-6)
launcher/MockLauncherIcon.h (+1/-1)
launcher/SimpleLauncherIcon.cpp (+3/-2)
launcher/SimpleLauncherIcon.h (+1/-1)
launcher/SingleMonitorLauncherIcon.cpp (+2/-2)
launcher/SingleMonitorLauncherIcon.h (+1/-1)
launcher/SoftwareCenterLauncherIcon.cpp (+0/-1)
launcher/SpacerLauncherIcon.cpp (+1/-2)
launcher/TrashLauncherIcon.cpp (+1/-2)
plugins/unityshell/src/unitya11ytests.cpp (+1/-1)
tests/test_single_monitor_launcher_icon.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/launcher-icon-construction-type
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Andrea Azzarone Pending
jenkins continuous-integration Pending
Review via email: mp+119139@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-08-02.

Commit message

LauncherIcon: make an icon type to be set on construction, so that it can't be changed

Description of the change

Makes a LauncherIcon to define it's type on construction, so that it can't be changed later.

Also fixed a crash (shown while running the tests) in TrashLauncherIcon

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote : Posted in a previous version of this proposal

LGTM

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/icon-classs-enum+quit-fix into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/icon-classs-enum+quit-fix into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/icon-classs-enum+quit-fix into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/icon-classs-enum+quit-fix into lp:unity.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Approving, since this was alredy approved by andyrock on superseded proposal.

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1023/console reported an error when processing this lp:~3v1n0/unity/launcher-icon-construction-type branch.
Not merging it.

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.