Google Documents Lens

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

  1. load-via-scope-id
  2. Merge into trunk
Proposed by James Henstridge
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~jamesh/unity-scope-gdrive/load-via-scope-id
Merge into: lp:unity-scope-gdrive
Diff against target: 21 lines (+3/-1)
2 files modified
gdrive.scope (+2/-0)
unity-scope-gdrive.service (+1/-1)
To merge this branch: bzr merge lp:~jamesh/unity-scope-gdrive/load-via-scope-id
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+172758@code.launchpad.net

Commit message

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.

Description of the change

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.

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

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)
Revision history for this message
Alberto Mardegan (mardy) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gdrive.scope'
2--- gdrive.scope 2013-05-17 19:52:38 +0000
3+++ gdrive.scope 2013-07-03 08:21:28 +0000
4@@ -1,6 +1,8 @@
5 [Scope]
6 DBusName=com.canonical.Unity.Scope.File.Gdrive
7 DBusPath=/com/canonical/unity/scope/file/gdrive
8+Module=gdrive.unity_gdrive_daemon
9+ModuleType=python3
10 Icon=/usr/share/icons/unity-icon-theme/places/svg/service-gdrive.svg
11 Keywords=gdrive;doc;drive;google;
12 Loader=/usr/share/unity-scopes/gdrive/unity_gdrive_daemon
13
14=== modified file 'unity-scope-gdrive.service'
15--- unity-scope-gdrive.service 2013-05-17 20:29:12 +0000
16+++ unity-scope-gdrive.service 2013-07-03 08:21:28 +0000
17@@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=com.canonical.Unity.Scope.File.Gdrive
20-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/gdrive/unity_gdrive_daemon.py
21+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s files/gdrive.scope

Subscribers

People subscribed via source and target branches