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

[Alejandro J. Cura]

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

[Ted Gould (ted)]

Makes sense to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/228
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/228

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/254/rebuild

review: Approve (continuous-integration)

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-08-01 15:04:19 +0000
+++ scope/clickapps/apps-scope.cpp	2014-08-06 21:49:59 +0000
@@ -40,6 +40,7 @@
 #include <click/click-i18n.h>
 #include <click/utils.h>
 #include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/ActivationResponse.h>
 
 #include "apps-scope.h"
 #include "apps-query.h"
@@ -105,8 +106,8 @@
         std::string const& /* widget_id */, std::string const& action_id)
 {
     if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
-        const unity::scopes::CannedQuery cquery("clickscope");
-        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, unity::scopes::ActivationResponse(cquery)));
+        auto response = unity::scopes::ActivationResponse(unity::scopes::ActivationResponse::ShowDash);
+        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, response));
     }
 
     auto activation = new ScopeActivation(result, metadata);