Merge lp:~stolowski/unity-scope-mediascanner/set-child-feeds into lp:unity-scope-mediascanner

Proposed by Paweł Stołowski
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 208
Merged at revision: 219
Proposed branch: lp:~stolowski/unity-scope-mediascanner/set-child-feeds
Merge into: lp:unity-scope-mediascanner
Diff against target: 49 lines (+4/-2)
4 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/musicaggregator/musicaggregator.ini.in (+1/-0)
src/videoaggregator/videoaggregator.ini.in (+1/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scope-mediascanner/set-child-feeds
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Pete Woods (community) Approve
Review via email: mp+239464@code.launchpad.net

Commit message

Set ids of aggreated scopes via ChildScopes ini option.

Description of the change

Set ids of aggreated scopes via ChildScopes ini option.

To post a comment you must log in.
James Henstridge (jamesh) wrote :

FYI: This doesn't produce correct results for a CLICK_MODE=ON build (since the names of the local media scopes change).

Paweł Stołowski (stolowski) wrote :

> FYI: This doesn't produce correct results for a CLICK_MODE=ON build (since the
> names of the local media scopes change).
Ok, I added IDs of both normal and click-ified versions to the .ini file; one or the other will be unknown at runtime and ignored by the Shell. I think at the end we will need to come up with cleaner solution re these IDs since it will make it difficult in other areas as well (e.g. favorites)? Then we can also clean this one up.

208. By Paweł Stołowski on 2014-11-21

Add recently added child scopes to ChildScopes ini option.

Pete Woods (pete-woods) wrote :

Looks reasonable enough to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-10-09 07:09:33 +0000
3+++ CMakeLists.txt 2014-11-21 11:35:16 +0000
4@@ -10,7 +10,7 @@
5 pkg_check_modules(GIO_DEPS REQUIRED gio-2.0 gio-unix-2.0)
6
7 pkg_check_modules(UNITY REQUIRED
8- "libunity-scopes >= 0.6.0"
9+ "libunity-scopes >= 0.6.9"
10 net-cpp>=1.1.0
11 jsoncpp
12 mediascanner-2.0
13
14=== modified file 'debian/control'
15--- debian/control 2014-09-16 15:45:45 +0000
16+++ debian/control 2014-11-21 11:35:16 +0000
17@@ -10,7 +10,7 @@
18 intltool,
19 libboost-regex-dev,
20 libmediascanner-2.0-dev (>= 0.105),
21- libunity-scopes-dev (>= 0.6.0),
22+ libunity-scopes-dev (>= 0.6.9),
23 libglib2.0-dev,
24 libsqlite3-dev,
25 mediascanner2.0,
26
27=== modified file 'src/musicaggregator/musicaggregator.ini.in'
28--- src/musicaggregator/musicaggregator.ini.in 2014-11-12 15:01:55 +0000
29+++ src/musicaggregator/musicaggregator.ini.in 2014-11-21 11:35:16 +0000
30@@ -7,6 +7,7 @@
31 _SearchHint=Search music
32 HotKey=
33 LocationDataNeeded=true
34+ChildScopes=mediascanner-music;com.ubuntu.scopes.mymusic_mymusic;com.canonical.scopes.grooveshark;com.canonical.scopes.sevendigital;com.ubuntu.scopes.soundcloud_soundcloud;com.canonical.scopes.songkick_songkick;com.ubuntu.scopes.youtube_youtube
35
36 [Appearance]
37 LogoOverlayColor=#26000000
38
39=== modified file 'src/videoaggregator/videoaggregator.ini.in'
40--- src/videoaggregator/videoaggregator.ini.in 2014-11-12 15:01:55 +0000
41+++ src/videoaggregator/videoaggregator.ini.in 2014-11-21 11:35:16 +0000
42@@ -6,6 +6,7 @@
43 Icon=./icon.png
44 _SearchHint=Search video
45 HotKey=
46+ChildScopes=mediascanner-video;com.ubuntu.scopes.myvideos_myvideos;com.ubuntu.scopes.youtube_youtube;com.ubuntu.scopes.vimeo_vimeo
47
48 [Appearance]
49 LogoOverlayColor=#26000000

Subscribers

People subscribed via source and target branches

to all changes: