Merge lp:~submarine/unity-scope-firefoxbookmarks/module_moduletype into lp:unity-scope-firefoxbookmarks

Proposed by David Callé on 2013-07-08
Status: Merged
Approved by: James Henstridge on 2013-07-08
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~submarine/unity-scope-firefoxbookmarks/module_moduletype
Merge into: lp:unity-scope-firefoxbookmarks
Diff against target: 21 lines (+3/-1)
2 files modified
data/firefoxbookmarks.scope.in (+2/-0)
data/unity-scope-firefoxbookmarks.service (+1/-1)
To merge this branch: bzr merge lp:~submarine/unity-scope-firefoxbookmarks/module_moduletype
Reviewer Review Type Date Requested Status
James Henstridge 2013-07-08 Approve on 2013-07-08
PS Jenkins bot (community) continuous-integration Approve on 2013-07-08
Review via email: mp+173422@code.launchpad.net

Commit message

Add module and moduletype

Description of the change

Add module and moduletype

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/firefoxbookmarks.scope.in'
2--- data/firefoxbookmarks.scope.in 2013-06-07 14:15:48 +0000
3+++ data/firefoxbookmarks.scope.in 2013-07-08 07:52:33 +0000
4@@ -7,6 +7,8 @@
5 RequiredMetadata=
6 OptionalMetadata=
7 Loader=/usr/share/unity-scopes/firefoxbookmarks/unity_firefoxbookmarks_daemon.py
8+Module=firefoxbookmarks.unity_firefoxbookmarks_daemon
9+ModuleType=python3
10 RemoteContent=false
11 Type=web
12 _Name=Firefox Bookmarks
13
14=== modified file 'data/unity-scope-firefoxbookmarks.service'
15--- data/unity-scope-firefoxbookmarks.service 2013-03-14 12:27:56 +0000
16+++ data/unity-scope-firefoxbookmarks.service 2013-07-08 07:52:33 +0000
17@@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=com.canonical.Unity.Scope.Webhistory.Firefoxbookmarks
20-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/firefoxbookmarks/unity_firefoxbookmarks_daemon.py
21+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s web/firefoxbookmarks.scope

Subscribers

People subscribed via source and target branches

to all changes: