unity-scopes-shell

Merge lp:~aacid/unity-scopes-shell/clickScopeNotSpecial into lp:unity-scopes-shell

  1. clickScopeNotSpecial
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 358
Merged at revision: 358
Proposed branch: lp:~aacid/unity-scopes-shell/clickScopeNotSpecial
Merge into: lp:unity-scopes-shell
Diff against target: 37 lines (+0/-13)
1 file modified
src/Unity/scopes.cpp (+0/-13)
To merge this branch: bzr merge lp:~aacid/unity-scopes-shell/clickScopeNotSpecial
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+315976@code.launchpad.net

Commit message

clickscope is no longer special

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Yep, makes sense in the new world, thanks!

review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:358
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1573
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1580
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1358/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1358/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1358/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1358/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1358/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1358
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1358/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/10/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/scopes.cpp'
2--- src/Unity/scopes.cpp 2016-11-15 10:53:34 +0000
3+++ src/Unity/scopes.cpp 2017-01-31 09:05:47 +0000
4@@ -48,7 +48,6 @@
5
6 #define SCOPES_SCOPE_ID "scopes"
7 #define PARTNER_ID_FILE "/custom/partner-id"
8-#define CLICK_SCOPE_ID "clickscope"
9
10 void ScopeListWorker::run()
11 {
12@@ -447,12 +446,6 @@
13 }
14 }
15
16- // special-case clickscope; append it to favorites if it was uninstalled (and in consequence removed from favorites) - see LP: #1603186
17- if (m_cachedMetadata.contains(CLICK_SCOPE_ID) && !m_favoriteScopes->hasScope(CLICK_SCOPE_ID)) {
18- qDebug() << "Favoriting" << CLICK_SCOPE_ID;
19- m_favoriteScopes->setFavorite(CLICK_SCOPE_ID, true);
20- }
21-
22 QSet<QString> scopesInTheModel;
23 int row = 0;
24 // remove un-favorited scopes
25@@ -654,12 +647,6 @@
26
27 void Scopes::setFavorite(QString const& scopeId, bool value)
28 {
29- if (scopeId == QStringLiteral(CLICK_SCOPE_ID) && !value)
30- {
31- qWarning() << "Cannot unfavorite" << scopeId;
32- return;
33- }
34-
35 int row = m_favoriteScopes->setFavorite(scopeId, value);
36 if (row >= 0)
37 {

Subscribers

People subscribed via source and target branches

to all changes: