Merge lp:~alecu/unity-scope-click/show-dash-instead into lp:unity-scope-click/devel

Proposed by Alejandro J. Cura
Status: Merged
Approved by: Ted Gould
Approved revision: 390
Merged at revision: 389
Proposed branch: lp:~alecu/unity-scope-click/show-dash-instead
Merge into: lp:unity-scope-click/devel
Diff against target: 22 lines (+3/-2)
1 file modified
scope/clickapps/apps-scope.cpp (+3/-2)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/show-dash-instead
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+229873@code.launchpad.net

Commit message

After an app is uninstalled, show the dash instead of a canned query

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Makes sense to me.

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/clickapps/apps-scope.cpp'
2--- scope/clickapps/apps-scope.cpp 2014-08-01 15:04:19 +0000
3+++ scope/clickapps/apps-scope.cpp 2014-08-06 21:49:59 +0000
4@@ -40,6 +40,7 @@
5 #include <click/click-i18n.h>
6 #include <click/utils.h>
7 #include <unity/scopes/CannedQuery.h>
8+#include <unity/scopes/ActivationResponse.h>
9
10 #include "apps-scope.h"
11 #include "apps-query.h"
12@@ -105,8 +106,8 @@
13 std::string const& /* widget_id */, std::string const& action_id)
14 {
15 if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
16- const unity::scopes::CannedQuery cquery("clickscope");
17- return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, unity::scopes::ActivationResponse(cquery)));
18+ auto response = unity::scopes::ActivationResponse(unity::scopes::ActivationResponse::ShowDash);
19+ return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, response));
20 }
21
22 auto activation = new ScopeActivation(result, metadata);

Subscribers

People subscribed via source and target branches

to all changes: