Unity

Merge lp://staging/~mhr3/unity/pass-extra-hints-for-perform-action into lp://staging/unity

pass-extra-hints-for-perform-action
Merge into trunk

Proposed by Michal Hruby on 2012-09-03

Status:

Merged

Approved by:

Paweł Stołowski on 2012-09-06

Approved revision:

no longer in the source branch.

Merged at revision:

2661

Proposed branch:

lp://staging/~mhr3/unity/pass-extra-hints-for-perform-action

Merge into:

lp://staging/unity

Diff against target:

183 lines (+85/-12)

5 files modified

UnityCore/Lens.cpp (+37/-8)
UnityCore/Lens.h (+2/-1)
UnityCore/Preview.cpp (+2/-2)
UnityCore/Preview.h (+3/-1)
tests/test_lens.cpp (+41/-0)

To merge this branch:

bzr merge lp://staging/~mhr3/unity/pass-extra-hints-for-perform-action

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paweł Stołowski (community)			Approve on 2012-09-06
Nick Dedekind (community)		2012-09-03	Approve on 2012-09-04
jenkins	continuous-integration		Pending
Review via email: mp+122547@code.staging.launchpad.net

Commit message

Make sure we can pass extra hints when activating preview actions

Description of the change

Make sure we can pass extra hints when activating preview actions. This also adds compability with latest changes in libunity.

Added tests for the issue.

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2012-09-04:

LGTM

Only comment is that it would be better if you could use the Hints typedef in dash::Preview::PerformAction.

161 + void PerformAction(std::string const& id,
162 + std::map<std::string, glib::Variant> const& hints =
163 + std::map<std::string, glib::Variant>()) const;

review: Approve

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-09-04:

> LGTM
>
> Only comment is that it would be better if you could use the Hints typedef in
> dash::Preview::PerformAction.
>

Wanted to, but it's defined in Lens.h, which includes Previews, so there'd be a circular dependency... :(

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-09-04:

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2012-09-06:

Looking good.

review: Approve