Unity

Merge lp://staging/~bilalakhtar/unity/sd-card-stop-device-960910 into lp://staging/unity

  1. sd-card-stop-device-960910
  2. Merge into trunk
Proposed by Bilal Akhtar
Status: Merged
Approved by: Bilal Akhtar
Approved revision: no longer in the source branch.
Merged at revision: 2615
Proposed branch: lp://staging/~bilalakhtar/unity/sd-card-stop-device-960910
Merge into: lp://staging/unity
Diff against target: 82 lines (+28/-1)
4 files modified
launcher/DeviceLauncherIcon.cpp (+6/-0)
launcher/DeviceLauncherIcon.h (+2/-1)
launcher/LauncherController.cpp (+2/-0)
manual-tests/Launcher.txt (+18/-0)
To merge this branch: bzr merge lp://staging/~bilalakhtar/unity/sd-card-stop-device-960910
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Tim Penhey (community) Needs Information
Review via email: mp+118771@code.staging.launchpad.net

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

Commit message

Dragging and dropping a SD card to the trash should 'safely remove' the card

Description of the change

SD cards can now be stopped if their DeviceLauncherIcon is dragged into Trash. Fixes bug #960910 .

Also, added manual test.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote : Posted in a previous version of this proposal

Test? I think a manual test would be needed here.

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

You could also test this using the mock we have for devices...

Revision history for this message
Tim Penhey (thumper) wrote :

Marco, could you explain how a quick unit test could be written?

I have a very strong preference for an automated test.

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

+1. I'll add a unit-test with my refactor (WIP).

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

No commit message specified.

Revision history for this message
Omer Akram (om26er) wrote :

added commit message and setting back to approved so this gets in.

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

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

text conflict in launcher/DeviceLauncherIcon.cpp
text conflict in launcher/DeviceLauncherIcon.h
text conflict in manual-tests/Launcher.txt

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Fixed the conflicts, branch now ready to be merged again.

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Can I mark it Approved again?

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1109/console reported an error when processing this lp:~bilalakhtar/unity/sd-card-stop-device-960910 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.