unity-scopes-shell

Merge lp:~marcustomlinson/unity-scopes-shell/lp-1356699 into lp:unity-scopes-shell

  1. lp-1356699
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 165
Merged at revision: 164
Proposed branch: lp:~marcustomlinson/unity-scopes-shell/lp-1356699
Merge into: lp:unity-scopes-shell
Diff against target: 45 lines (+5/-6)
3 files modified
debian/control (+1/-1)
src/Unity/CMakeLists.txt (+1/-1)
src/Unity/scopes.cpp (+3/-4)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-shell/lp-1356699
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Pete Woods (community) Approve
Review via email: mp+239215@code.launchpad.net

Commit message

Listen to list update pub/sub mechanism to invalidate smart scopes

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

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/150/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/153/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/253/rebuild

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

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/255/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/155/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/255/rebuild

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

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/256/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/153/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/256/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/259/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-01 14:01:26 +0000
3+++ debian/control 2014-11-18 09:26:23 +0000
4@@ -4,7 +4,7 @@
5 Build-Depends: cmake,
6 debhelper (>= 9),
7 libunity-api-dev (>= 7.88),
8- libunity-scopes-dev (>= 0.6.7~),
9+ libunity-scopes-dev (>= 0.6.8~),
10 libgsettings-qt-dev (>= 0.1),
11 libqtdbustest1-dev (>= 0.2),
12 libqtdbusmock1-dev (>= 0.2),
13
14=== modified file 'src/Unity/CMakeLists.txt'
15--- src/Unity/CMakeLists.txt 2014-10-01 14:01:26 +0000
16+++ src/Unity/CMakeLists.txt 2014-11-18 09:26:23 +0000
17@@ -3,7 +3,7 @@
18
19 # Dependencies
20 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
21-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.7)
22+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.8)
23 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
24 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
25 pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
26
27=== modified file 'src/Unity/scopes.cpp'
28--- src/Unity/scopes.cpp 2014-10-16 09:00:19 +0000
29+++ src/Unity/scopes.cpp 2014-11-18 09:26:23 +0000
30@@ -488,13 +488,12 @@
31 invalidateScopeResults("musicaggregator");
32 } else if (scopeName == "mediascanner-video") {
33 invalidateScopeResults("videoaggregator");
34- } else if (scopeName == "smart-scopes") {
35- // emitted when smart scopes proxy discovers new scopes
36+ } else if (scopeName == "scopes") {
37+ // emitted when smart-scopes proxy or scope registry discovers new scopes
38+ refreshScopeMetadata();
39 Q_FOREACH(Scope* scope, m_scopes) {
40 scope->invalidateResults();
41 }
42- } else if (scopeName == "scopes") {
43- refreshScopeMetadata();
44 return;
45 }
46

Subscribers

People subscribed via source and target branches

to all changes: