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

[David King]

Use Google Drive not Google Docs in user-visible strings

[Alberto Mardegan (mardy)]

Great!

review: Approve

=== 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 @@
 include build_i18n_ext.py
-include unity-scope-gdocs.service
-include gdocs.scope
+include unity-scope-gdrive.service
+include gdrive.scope
 include po/*
-include unity-scope-gdocs.application.in
-include unity-scope-gdocs
+include unity-scope-gdrive.application.in
+include unity-scope-gdrive
 include COPYING

=== modified file 'README'
--- README	2012-08-14 13:57:11 +0000
+++ README	2012-10-25 09:40:32 +0000
@@ -1,26 +1,28 @@
-Sample Unity Lens Daemon written in Python
-------------------------------------------
+Sample Unity scope Daemon written in Python
+-------------------------------------------
 
 Dependencies
 ------------
-Introspection data for libunity, libdee, and libdbusmenu-glib
-
-gir1.2-unity-4.0
-gir1.2-dee-0.5
-gir1.2-dbusmenu-glib-0.4
-libaccounts-glib
-libsignon-glib
-
-Trying out the lens
--------------------
-
-You can install the lens like this:
+
+Introspection data for libunity, libdee, libaccounts-glib, libsignon-glib and
+libgdata:
+
+gir1.2-unity-5.0
+gir1.2-dee-1.0
+gir1.2-accounts-1.0
+gir1.2-signon-1.0
+gir1.2-gdata-0.0
+
+Trying out the scope
+--------------------
+
+You can install the scope like this:
 
   python setup.py install --prefix=/usr
 
 Then run the daemon with:
 
-  ./unity-lens-gdocs
+  ./unity-scope-gdrive
 
 And from another terminal restart Unity like this:
 
@@ -29,20 +31,16 @@
 [the setsid ^^ is a small trick to detach the unity process from the terminal
  so you can close it if you want. A bit like 'unity &' just better ;-) ]
 
-Past this step you can freely Control-C the lens daemon to stop it,
+Past this step you can freely Control-C the scope daemon to stop it,
 do some changes, and restart it. No need to restart Unity, it will find
 the newly started daemon automatically.
 
-Getting rid of the Lens
--------------------------------
-Just remove the gdocs.lens file. Fx, by issuing:
-
-  sudo rm /usr/share/unity/lenses/gdocs/gdocs.lens
-
-You may want to remove the icon as well, but that's no issue if you don't:
-
-  sudo rm /usr/share/unity/lenses/gdocs/gdocs.svg
+Getting rid of the scope
+------------------------
+
+Just remove the gdrive.scope file. For example, by issuing:
+
+  sudo rm /usr/share/unity/lenses/files/gdrive.scope
 
 With that done, restart Unity once again with 'setsid unity' and all should
 be back to normal.
-

=== 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 @@
 [Scope]
-DBusName=net.launchpad.Unity.Scope.GDocs
-DBusPath=/net/launchpad/unity/scope/gdocs
+DBusName=net.launchpad.Unity.Scope.GDrive
+DBusPath=/net/launchpad/unity/scope/gdrive

=== 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 @@
 i18n=True
 
 [build_i18n]
-domain=unity-scope-gdocs
-xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdocs.application.in',))]
+domain=unity-scope-gdrive
+xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdrive.application.in',))]

=== 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 @@
 #
 # The primary bus name we grab *must* match what we specify in our .scope file
 #
-BUS_NAME = "net.launchpad.Unity.Scope.GDocs"
+BUS_NAME = "net.launchpad.Unity.Scope.GDrive"
 # Map Google Docs types to the values of the "type" filter
 TYPE_MAP = {
     "document": "documents",
@@ -38,7 +38,7 @@
 class Daemon:
 
   def __init__ (self):
-    self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdocs")
+    self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdrive")
     self._scope.search_in_global = True;
     self._preferences = Unity.PreferencesManager.get_default()
     self._preferences.connect ("notify::remote-content-search",

=== 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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<application id="unity-scope-gdocs">
-  <_description>Google Docs search plugin</_description>
-  <translations>unity-scope-gdocs</translations>
-  <desktop-entry>unity-scope-gdocs.desktop</desktop-entry>
+<application id="unity-scope-gdrive">
+  <_description>Google Drive search plugin</_description>
+  <translations>unity-scope-gdrive</translations>
+  <desktop-entry>unity-scope-gdrive.desktop</desktop-entry>
 
 
   <services>
-    <service id="google-docs">
-      <_description>Search your Google Docs files</_description>
+    <service id="google-drive">
+      <_description>Search your Google Drive files</_description>
     </service>
   </services>
 

=== 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 @@
 [Desktop Entry]
 Categories=Office;
 Exec=
-GenericName=unity-scope-gdocs
-Icon=unity-scope-gdocs
-Name=Google Documents scope for Unity
+GenericName=unity-scope-gdrive
+Icon=unity-scope-gdrive
+Name=Google Drive scope for Unity
 NoDisplay=true
 Terminal=false
 Type=Application

=== 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 @@
 [D-BUS Service]
-Name=net.launchpad.Unity.Scope.GDocs
-Exec=/usr/lib/unity-lens-files/unity-scope-gdocs
+Name=net.launchpad.Unity.Scope.GDrive
+Exec=/usr/lib/unity-lens-files/unity-scope-gdrive