Merge lp:~jamesh/unity-scope-gdrive/load-via-scope-id into lp:unity-scope-gdrive

[James Henstridge]

Add metadata to the .scope file so it can be loaded as part of a group in future. Also update the .service file to use this info to load the implementation.

Add metadata to the .scope file so it can be loaded as part of a group in future. Also update the .service file to use this info to load the implementation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-gdrive-ci/5/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

=== modified file 'gdrive.scope'
--- gdrive.scope	2013-05-17 19:52:38 +0000
+++ gdrive.scope	2013-07-03 08:21:28 +0000
@@ -1,6 +1,8 @@
 [Scope]
 DBusName=com.canonical.Unity.Scope.File.Gdrive
 DBusPath=/com/canonical/unity/scope/file/gdrive
+Module=gdrive.unity_gdrive_daemon
+ModuleType=python3
 Icon=/usr/share/icons/unity-icon-theme/places/svg/service-gdrive.svg
 Keywords=gdrive;doc;drive;google;
 Loader=/usr/share/unity-scopes/gdrive/unity_gdrive_daemon
 
=== modified file 'unity-scope-gdrive.service'
--- unity-scope-gdrive.service	2013-05-17 20:29:12 +0000
+++ unity-scope-gdrive.service	2013-07-03 08:21:28 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.File.Gdrive
-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/gdrive/unity_gdrive_daemon.py
+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s files/gdrive.scope