libunity

Merge lp:~mhr3/libunity/update-scopes-definitions into lp:libunity

  1. update-scopes-definitions
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 307
Merged at revision: 307
Proposed branch: lp:~mhr3/libunity/update-scopes-definitions
Merge into: lp:libunity
Diff against target: 26 lines (+6/-5)
2 files modified
data/client-scopes-phone.json (+4/-4)
data/client-scopes.json (+2/-1)
To merge this branch: bzr merge lp:~mhr3/libunity/update-scopes-definitions
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+193275@code.launchpad.net

Commit message

Update scope definitions for the phone.

Description of the change

Update scope definitions for the phone, to match the current image.

(and improve formatting of the desktop definitions)

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

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/libunity-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-i386-ci/8

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libunity-ci/137/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Looks good. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/client-scopes-phone.json'
2--- data/client-scopes-phone.json 2013-10-15 16:28:10 +0000
3+++ data/client-scopes-phone.json 2013-10-30 16:14:18 +0000
4@@ -1,7 +1,7 @@
5-{"unity-lens-applications": ["applications-applications.scope", "commands.scope", "applications-scopes.scope"],
6- "unity-lens-friends": ["social.scope"],
7- "unity-scope-gdrive": ["files-gdrive.scope"],
8- "unity-scope-musicstores": ["music-musicstore.scope"],
9+{
10+ "unity-scope-click": ["applications-click.scope", "applications-non-click.scope"],
11+ "unity-scope-mediascanner": ["music-mediascanner.scope", "video-mediascanner.scope"],
12+ "unity-scope-onlinemusic": ["music-onlinemusic.scope"],
13 "unity-scope-video-remote": ["video-remote.scope"],
14 "unity-scope-home": ["home.scope", "applications.scope", "books.scope", "boxes.scope", "calendar.scope", "code.scope", "files.scope", "graphics.scope", "help.scope", "info.scope", "more_suggestions.scope", "music.scope", "news.scope", "notes.scope", "photos.scope", "recipes.scope", "reference.scope", "searchin.scope", "video.scope", "weather.scope", "web.scope"]
15 }
16
17=== modified file 'data/client-scopes.json'
18--- data/client-scopes.json 2013-10-15 16:28:10 +0000
19+++ data/client-scopes.json 2013-10-30 16:14:18 +0000
20@@ -1,4 +1,5 @@
21-{"unity-lens-applications": ["applications-applications.scope", "commands.scope", "applications-scopes.scope"],
22+{
23+ "unity-lens-applications": ["applications-applications.scope", "commands.scope", "applications-scopes.scope"],
24 "unity-lens-files": ["files-local.scope"],
25 "unity-lens-friends": ["social.scope"],
26 "unity-lens-music": ["music-banshee.scope", "music-rhythmbox.scope"],

Subscribers

People subscribed via source and target branches