From 89fe43f70c8cae763224c78eabc467f4807985a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 6 Feb 2012 14:39:22 +0100
Subject: [PATCH] search: Rename search_providers to open-search-providers

We will allow applications to hook into shell's search by registering
a service which implements a well-known DBus interface.
"search-providers" is a reasonable directory name for applications to
drop their registration files, but it conflicts with "search_providers"
used by open search providers - rename the latter to avoid confusion.

https://bugzilla.gnome.org/show_bug.cgi?id=663125
---
 data/Makefile.am                                            | 6 +++---
 data/{search_providers => open-search-providers}/google.xml | 0
 .../wikipedia.xml                                           | 0
 js/ui/search.js                                             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename data/{search_providers => open-search-providers}/google.xml (100%)
 rename data/{search_providers => open-search-providers}/wikipedia.xml (100%)

diff --git a/data/Makefile.am b/data/Makefile.am
index 189f575b9..cbc7b796d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,10 +12,10 @@ desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 %.desktop:%.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-searchprovidersdir = $(pkgdatadir)/search_providers
+searchprovidersdir = $(pkgdatadir)/open-search-providers
 dist_searchproviders_DATA =				\
-	search_providers/google.xml				\
-	search_providers/wikipedia.xml
+	open-search-providers/google.xml		\
+	open-search-providers/wikipedia.xml
 
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
diff --git a/data/search_providers/google.xml b/data/open-search-providers/google.xml
similarity index 100%
rename from data/search_providers/google.xml
rename to data/open-search-providers/google.xml
diff --git a/data/search_providers/wikipedia.xml b/data/open-search-providers/wikipedia.xml
similarity index 100%
rename from data/search_providers/wikipedia.xml
rename to data/open-search-providers/wikipedia.xml
diff --git a/js/ui/search.js b/js/ui/search.js
index 3b35e4919..ed0ea4848 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -310,7 +310,7 @@ const OpenSearchSystem = new Lang.Class({
     },
 
     _addProvider: function(fileName) {
-        let path = global.datadir + '/search_providers/' + fileName;
+        let path = global.datadir + '/open-search-providers/' + fileName;
         let source = Shell.get_file_contents_utf8_sync(path);
         let [success, name, url, langs, icon_uri] = Shell.parse_search_provider(source);
         let provider ={ name: name,
@@ -327,7 +327,7 @@ const OpenSearchSystem = new Lang.Class({
     _refresh: function() {
         this._providers = [];
         let names = global.settings.get_strv(DISABLED_OPEN_SEARCH_PROVIDERS_KEY);
-        let file = Gio.file_new_for_path(global.datadir + '/search_providers');
+        let file = Gio.file_new_for_path(global.datadir + '/open-search-providers');
         FileUtils.listDirAsync(file, Lang.bind(this, function(files) {
             for (let i = 0; i < files.length; i++) {
                 let enabled = true;