Merge lp:~marcustomlinson/unity-scope-mediascanner/aggregate_vimeo into lp:unity-scope-mediascanner

[Marcus Tomlinson]

Aggregate the Vimeo scope in the videoaggregator scope

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/161/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/161/rebuild

review: Approve (continuous-integration)

=== modified file 'src/videoaggregator/videoaggregator-settings.ini.in'
--- src/videoaggregator/videoaggregator-settings.ini.in	2014-10-06 10:20:24 +0000
+++ src/videoaggregator/videoaggregator-settings.ini.in	2014-11-14 09:26:36 +0000
@@ -2,3 +2,8 @@
 type=boolean
 defaultValue=true
 _displayName=Display results from YouTube
+
+[com.ubuntu.scopes.vimeo_vimeo]
+type=boolean
+defaultValue=true
+_displayName=Display results from Vimeo

=== modified file 'src/videoaggregator/videoaggregatorscope.cpp'
--- src/videoaggregator/videoaggregatorscope.cpp	2014-10-09 06:58:00 +0000
+++ src/videoaggregator/videoaggregatorscope.cpp	2014-11-14 09:26:36 +0000
@@ -35,6 +35,7 @@
     "mediascanner-video",
 #endif
     "com.ubuntu.scopes.youtube_youtube",
+    "com.ubuntu.scopes.vimeo_vimeo",
 };
 
 void VideoAggregatorScope::start(std::string const&) {