[gnome-documents] search-provider: Use 'DesktopId' instead of 'Title'/'Icon'

[Florian MÃllner <fmuellner src gnome org>]

commit 2863696d3a7f4996a86d9c59c00eb19a85db85a8
Author: Florian MÃllner <fmuellner gnome org>
Date:   Fri Jun 22 18:05:17 2012 +0200

    search-provider: Use 'DesktopId' instead of 'Title'/'Icon'
    
    The values are just duplicating the 'Name'/'Icon' fields in the
    .desktop file, so point gnome-shell to that instead.

 .gitignore                                         |    1 -
 data/Makefile.am                                   |    7 +------
 ....ini.in => gnome-documents-search-provider.ini} |    3 +--
 po/POTFILES.in                                     |    1 -
 4 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a5ce80..3c90b56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ config.log
 config.status
 config
 configure
-data/gnome-documents-search-provider.ini
 data/gnome-documents.desktop
 data/gnome-documents.desktop.in
 data/org.gnome.Documents.enums.xml
diff --git a/data/Makefile.am b/data/Makefile.am
index 8dcfdea..2d1c9ed 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,13 +6,9 @@ desktop_in_files = gnome-documents.desktop.in
 
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 searchprovider_DATA = gnome-documents-search-provider.ini
-searchprovider_in_files = gnome-documents-search-provider.ini.in
 
 @INTLTOOL_DESKTOP_RULE@
 
-%.ini: %.ini.in
-	LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
 
@@ -49,11 +45,10 @@ EXTRA_DIST= \
     gnome-documents.desktop \
     $(service_in_files) \
     $(desktop_in_files) \
-    $(searchprovider_in_files) \
+    $(searchprovider_DATA) \
     $(gsettingsschema_in_files)
 
 CLEANFILES = \
     $(desktop_DATA) \
-    $(searchprovider_DATA) \
     $(gsettings_SCHEMAS) \
     $(service_DATA)
diff --git a/data/gnome-documents-search-provider.ini.in b/data/gnome-documents-search-provider.ini
similarity index 75%
rename from data/gnome-documents-search-provider.ini.in
rename to data/gnome-documents-search-provider.ini
index 383e2c4..95c3b9f 100644
--- a/data/gnome-documents-search-provider.ini.in
+++ b/data/gnome-documents-search-provider.ini
@@ -1,5 +1,4 @@
 [Shell Search Provider]
-_Title=Documents
-Icon=gnome-documents
+DesktopId=gnome-documents.desktop
 BusName=org.gnome.Documents.SearchProvider
 ObjectPath=/org/gnome/Documents/SearchProvider
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 178154c..516e314 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
 [encoding: UTF-8]
-data/gnome-documents-search-provider.ini.in
 data/gnome-documents.desktop.in.in
 data/org.gnome.documents.gschema.xml.in
 src/application.js