Merge lp:~mikemc/unity-scope-click/remove-dummy-progress-actions into lp:unity-scope-click

Proposed by Mike McCracken
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 158
Merged at revision: 158
Proposed branch: lp:~mikemc/unity-scope-click/remove-dummy-progress-actions
Merge into: lp:unity-scope-click
Diff against target: 25 lines (+0/-15)
1 file modified
scope/click/preview.cpp (+0/-15)
To merge this branch: bzr merge lp:~mikemc/unity-scope-click/remove-dummy-progress-actions
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alejandro J. Cura (community) Approve
Review via email: mp+207066@code.launchpad.net

Commit message

- Remove extra buttons that are not needed in new scopes API.

Description of the change

- Remove extra buttons that are not needed in new scopes API.

These specially named buttons were used in the old api as a hackaround to send hidden info.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scope/click/preview.cpp'
2--- scope/click/preview.cpp 2014-02-18 15:45:09 +0000
3+++ scope/click/preview.cpp 2014-02-18 23:30:08 +0000
4@@ -231,21 +231,6 @@
5 tuple["dbus-object"] = object_path;
6 progress.add_attribute("source", scopes::Variant(tuple));
7 widgets.push_back(progress);
8-
9- scopes::PreviewWidget buttons("buttons", "actions");
10- scopes::VariantBuilder builder;
11- builder.add_tuple(
12- {
13- {"id", scopes::Variant(click::Preview::Actions::DOWNLOAD_COMPLETED)},
14- {"label", scopes::Variant("*** download_completed")}
15- });
16- builder.add_tuple(
17- {
18- {"id", scopes::Variant(click::Preview::Actions::DOWNLOAD_FAILED)},
19- {"label", scopes::Variant("*** download_failed")}
20- });
21- buttons.add_attribute("actions", builder.end());
22- widgets.push_back(buttons);
23 }
24
25 buildDescriptionAndReviews(reply, widgets, details);

Subscribers

People subscribed via source and target branches

to all changes: