unity-scope-click

Merge lp:~alecu/unity-scope-click/more-refreshing into lp:unity-scope-click/devel

  1. more-refreshing
  2. Merge into devel
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 436
Merged at revision: 437
Proposed branch: lp:~alecu/unity-scope-click/more-refreshing
Merge into: lp:unity-scope-click/devel
Diff against target: 28 lines (+5/-2)
2 files modified
libclickscope/click/download-manager.h (+3/-1)
libclickscope/click/index.cpp (+2/-1)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/more-refreshing
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+232946@code.launchpad.net

Commit message

Refresh the store scope too on uninstall

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
lp:~alecu/unity-scope-click/more-refreshing updated
436. By Alejandro J. Cura

empty commit to trigger a rebuild

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libclickscope/click/download-manager.h'
2--- libclickscope/click/download-manager.h 2014-08-21 13:21:24 +0000
3+++ libclickscope/click/download-manager.h 2014-09-03 15:04:52 +0000
4@@ -50,7 +50,9 @@
5 namespace click
6 {
7 // The dbus-send command to refresh the search results in the dash.
8-static const QString DBUSSEND_COMMAND = QStringLiteral("dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:clickscope");
9+static const QString REFRESH_SCOPE_COMMAND = QStringLiteral("dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:%1");
10+static const QString APPS_SCOPE_ID = QStringLiteral("clickscope");
11+static const QString STORE_SCOPE_ID = QStringLiteral("com.canonical.scopes.clickstore");
12
13 const QByteArray& CLICK_TOKEN_HEADER();
14
15
16=== modified file 'libclickscope/click/index.cpp'
17--- libclickscope/click/index.cpp 2014-06-26 18:57:08 +0000
18+++ libclickscope/click/index.cpp 2014-09-03 15:04:52 +0000
19@@ -68,7 +68,8 @@
20 qDebug() << "command finished with exit code:" << code;
21 callback(code, process.data()->readAllStandardError().data());
22 if (code == 0) {
23- QProcess::execute(DBUSSEND_COMMAND);
24+ QProcess::execute(REFRESH_SCOPE_COMMAND.arg(APPS_SCOPE_ID));
25+ QProcess::execute(REFRESH_SCOPE_COMMAND.arg(STORE_SCOPE_ID));
26 }
27 } );
28 QObject::connect(process.data(),

Subscribers

People subscribed via source and target branches

to all changes: