Merge lp:~stolowski/libunity/fix-scope-ids into lp:~unity-team/libunity/libunity-7.0

[Paweł Stołowski]

Fixed scope ids.

Fixed scope ids.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/57/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Let's wait for the scope branches to land first.

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'data/client-scopes.json'
--- data/client-scopes.json	2013-03-26 11:48:14 +0000
+++ data/client-scopes.json	2013-04-22 18:39:45 +0000
@@ -1,12 +1,12 @@
 {"unity-lens-applications": ["applications.scope", "commands.scope"],
- "unity-lens-files": ["files-files-local.scope"],
+ "unity-lens-files": ["files-local.scope"],
  "unity-lens-friends": ["social.scope"],
- "unity-lens-music": ["music-music-banshee.scope", "music-music-rhythmbox.scope"],
+ "unity-lens-music": ["music-banshee.scope", "music-rhythmbox.scope"],
  "unity-lens-photos": ["photos-shotwell.scope", "photos-facebook.scope", "photos-flickr.scope", "photos-picasa.scope"],
- "unity-lens-video": ["video-video-local.scope"],
+ "unity-lens-video": ["video-local.scope"],
  "unity-scope-gdrive": ["files-gdrive.scope"],
  "unity-scope-musicstores": ["music-musicstore.scope"],
- "unity-scope-video-remote": ["video-video-remote.scope"],
+ "unity-scope-video-remote": ["video-remote.scope"],
  "unity-scope-audacious": ["music-audacious.scope"],
  "unity-scope-calculator": ["info-calculator.scope"],
  "unity-scope-chromiumbookmarks": ["web-chromiumbookmarks.scope"],