Unity

Merge lp://qastaging/~stolowski/unity/zg-event-on-trash-dnd into lp://qastaging/unity

  1. zg-event-on-trash-dnd
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Paweł Stołowski
Approved revision: no longer in the source branch.
Merged at revision: 2699
Proposed branch: lp://qastaging/~stolowski/unity/zg-event-on-trash-dnd
Merge into: lp://qastaging/unity
Diff against target: 96 lines (+48/-2)
3 files modified
CMakeLists.txt (+1/-1)
launcher/TrashLauncherIcon.cpp (+28/-1)
manual-tests/Launcher.txt (+19/-0)
To merge this branch: bzr merge lp://qastaging/~stolowski/unity/zg-event-on-trash-dnd
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Michal Hruby (community) Approve
Review via email: mp+123118@code.qastaging.launchpad.net

Commit message

Register file delete events in zeitgeist when file is dropped onto Trash launcher icon.
Added zeitgeist dependency.

Description of the change

Register file delete events in zeitgeist when file is dropped onto Trash launcher icon.
Added zeitgeist dependency.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

What about tests?

review: Needs Information
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Test added. Ready for re-review.

Revision history for this message
Michal Hruby (mhr3) wrote :

Approved, waiting for ACK on the FFe to merge.

review: Approve
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

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1280/console reported an error when processing this lp:~stolowski/unity/zg-event-on-trash-dnd branch.
Not merging it.

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

could you please move
 const std::string ZEITGEIST_UNITY_ACTOR = "application://compiz.desktop";
down to the unnamed namespace? :)

also, please get rid of the spaces between function and ( ;)

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1296/console reported an error when processing this lp:~stolowski/unity/zg-event-on-trash-dnd branch.
Not merging it.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Read for re-review.

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

thanks, that's fine! ;)

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1308/console reported an error when processing this lp:~stolowski/unity/zg-event-on-trash-dnd 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.