Merge lp:~amigadave/unity-scope-gdrive/google-drive-rename into lp:unity-scope-gdrive

Proposed by David King on 2012-10-25
Status: Merged
Approved by: Alberto Mardegan on 2012-10-25
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~amigadave/unity-scope-gdrive/google-drive-rename
Merge into: lp:unity-scope-gdrive
Diff against target: 187 lines (+45/-47)
8 files modified
MANIFEST.in (+4/-4)
README (+24/-26)
gdrive.scope (+2/-2)
setup.cfg (+2/-2)
unity-scope-gdrive (+2/-2)
unity-scope-gdrive.application.in (+6/-6)
unity-scope-gdrive.desktop (+3/-3)
unity-scope-gdrive.service (+2/-2)
To merge this branch: bzr merge lp:~amigadave/unity-scope-gdrive/google-drive-rename
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2012-10-25 Approve on 2012-10-25
Review via email: mp+131351@code.launchpad.net

Description of the change

Use Google Drive not Google Docs in user-visible strings

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2012-09-19 09:53:20 +0000
+++ MANIFEST.in 2012-10-25 09:40:32 +0000
@@ -1,7 +1,7 @@
1include build_i18n_ext.py1include build_i18n_ext.py
2include unity-scope-gdocs.service2include unity-scope-gdrive.service
3include gdocs.scope3include gdrive.scope
4include po/*4include po/*
5include unity-scope-gdocs.application.in5include unity-scope-gdrive.application.in
6include unity-scope-gdocs6include unity-scope-gdrive
7include COPYING7include COPYING
88
=== modified file 'README'
--- README 2012-08-14 13:57:11 +0000
+++ README 2012-10-25 09:40:32 +0000
@@ -1,26 +1,28 @@
1Sample Unity Lens Daemon written in Python1Sample Unity scope Daemon written in Python
2------------------------------------------2-------------------------------------------
33
4Dependencies4Dependencies
5------------5------------
6Introspection data for libunity, libdee, and libdbusmenu-glib6
77Introspection data for libunity, libdee, libaccounts-glib, libsignon-glib and
8gir1.2-unity-4.08libgdata:
9gir1.2-dee-0.59
10gir1.2-dbusmenu-glib-0.410gir1.2-unity-5.0
11libaccounts-glib11gir1.2-dee-1.0
12libsignon-glib12gir1.2-accounts-1.0
1313gir1.2-signon-1.0
14Trying out the lens14gir1.2-gdata-0.0
15-------------------15
1616Trying out the scope
17You can install the lens like this:17--------------------
18
19You can install the scope like this:
1820
19 python setup.py install --prefix=/usr21 python setup.py install --prefix=/usr
2022
21Then run the daemon with:23Then run the daemon with:
2224
23 ./unity-lens-gdocs25 ./unity-scope-gdrive
2426
25And from another terminal restart Unity like this:27And from another terminal restart Unity like this:
2628
@@ -29,20 +31,16 @@
29[the setsid ^^ is a small trick to detach the unity process from the terminal31[the setsid ^^ is a small trick to detach the unity process from the terminal
30 so you can close it if you want. A bit like 'unity &' just better ;-) ]32 so you can close it if you want. A bit like 'unity &' just better ;-) ]
3133
32Past this step you can freely Control-C the lens daemon to stop it,34Past this step you can freely Control-C the scope daemon to stop it,
33do some changes, and restart it. No need to restart Unity, it will find35do some changes, and restart it. No need to restart Unity, it will find
34the newly started daemon automatically.36the newly started daemon automatically.
3537
36Getting rid of the Lens38Getting rid of the scope
37-------------------------------39------------------------
38Just remove the gdocs.lens file. Fx, by issuing:40
3941Just remove the gdrive.scope file. For example, by issuing:
40 sudo rm /usr/share/unity/lenses/gdocs/gdocs.lens42
4143 sudo rm /usr/share/unity/lenses/files/gdrive.scope
42You may want to remove the icon as well, but that's no issue if you don't:
43
44 sudo rm /usr/share/unity/lenses/gdocs/gdocs.svg
4544
46With that done, restart Unity once again with 'setsid unity' and all should45With that done, restart Unity once again with 'setsid unity' and all should
47be back to normal.46be back to normal.
48
4947
=== renamed file 'gdocs.scope' => 'gdrive.scope'
--- gdocs.scope 2012-07-24 12:21:51 +0000
+++ gdrive.scope 2012-10-25 09:40:32 +0000
@@ -1,3 +1,3 @@
1[Scope]1[Scope]
2DBusName=net.launchpad.Unity.Scope.GDocs2DBusName=net.launchpad.Unity.Scope.GDrive
3DBusPath=/net/launchpad/unity/scope/gdocs3DBusPath=/net/launchpad/unity/scope/gdrive
44
=== modified file 'setup.cfg'
--- setup.cfg 2012-09-19 09:53:20 +0000
+++ setup.cfg 2012-10-25 09:40:32 +0000
@@ -2,5 +2,5 @@
2i18n=True2i18n=True
33
4[build_i18n]4[build_i18n]
5domain=unity-scope-gdocs5domain=unity-scope-gdrive
6xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdocs.application.in',))]6xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdrive.application.in',))]
77
=== renamed file 'unity-scope-gdocs' => 'unity-scope-gdrive'
--- unity-scope-gdocs 2012-10-16 08:12:16 +0000
+++ unity-scope-gdrive 2012-10-25 09:40:32 +0000
@@ -24,7 +24,7 @@
24#24#
25# The primary bus name we grab *must* match what we specify in our .scope file25# The primary bus name we grab *must* match what we specify in our .scope file
26#26#
27BUS_NAME = "net.launchpad.Unity.Scope.GDocs"27BUS_NAME = "net.launchpad.Unity.Scope.GDrive"
28# Map Google Docs types to the values of the "type" filter28# Map Google Docs types to the values of the "type" filter
29TYPE_MAP = {29TYPE_MAP = {
30 "document": "documents",30 "document": "documents",
@@ -38,7 +38,7 @@
38class Daemon:38class Daemon:
3939
40 def __init__ (self):40 def __init__ (self):
41 self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdocs")41 self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdrive")
42 self._scope.search_in_global = True;42 self._scope.search_in_global = True;
43 self._preferences = Unity.PreferencesManager.get_default()43 self._preferences = Unity.PreferencesManager.get_default()
44 self._preferences.connect ("notify::remote-content-search",44 self._preferences.connect ("notify::remote-content-search",
4545
=== renamed file 'unity-scope-gdocs.application.in' => 'unity-scope-gdrive.application.in'
--- unity-scope-gdocs.application.in 2012-09-19 11:39:19 +0000
+++ unity-scope-gdrive.application.in 2012-10-25 09:40:32 +0000
@@ -1,13 +1,13 @@
1<?xml version="1.0" encoding="UTF-8" ?>1<?xml version="1.0" encoding="UTF-8" ?>
2<application id="unity-scope-gdocs">2<application id="unity-scope-gdrive">
3 <_description>Google Docs search plugin</_description>3 <_description>Google Drive search plugin</_description>
4 <translations>unity-scope-gdocs</translations>4 <translations>unity-scope-gdrive</translations>
5 <desktop-entry>unity-scope-gdocs.desktop</desktop-entry>5 <desktop-entry>unity-scope-gdrive.desktop</desktop-entry>
66
77
8 <services>8 <services>
9 <service id="google-docs">9 <service id="google-drive">
10 <_description>Search your Google Docs files</_description>10 <_description>Search your Google Drive files</_description>
11 </service>11 </service>
12 </services>12 </services>
1313
1414
=== renamed file 'unity-scope-gdocs.desktop' => 'unity-scope-gdrive.desktop'
--- unity-scope-gdocs.desktop 2012-09-19 12:16:29 +0000
+++ unity-scope-gdrive.desktop 2012-10-25 09:40:32 +0000
@@ -1,9 +1,9 @@
1[Desktop Entry]1[Desktop Entry]
2Categories=Office;2Categories=Office;
3Exec=3Exec=
4GenericName=unity-scope-gdocs4GenericName=unity-scope-gdrive
5Icon=unity-scope-gdocs5Icon=unity-scope-gdrive
6Name=Google Documents scope for Unity6Name=Google Drive scope for Unity
7NoDisplay=true7NoDisplay=true
8Terminal=false8Terminal=false
9Type=Application9Type=Application
1010
=== renamed file 'unity-scope-gdocs.png' => 'unity-scope-gdrive.png'
=== renamed file 'unity-scope-gdocs.service' => 'unity-scope-gdrive.service'
--- unity-scope-gdocs.service 2012-07-24 12:21:51 +0000
+++ unity-scope-gdrive.service 2012-10-25 09:40:32 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=net.launchpad.Unity.Scope.GDocs2Name=net.launchpad.Unity.Scope.GDrive
3Exec=/usr/lib/unity-lens-files/unity-scope-gdocs3Exec=/usr/lib/unity-lens-files/unity-scope-gdrive

Subscribers

People subscribed via source and target branches