1 files changed, 50 insertions, 0 deletions

diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch
new file mode 100644
index 0000000..940eac7
--- /dev/null
+++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch
@@ -0,0 +1,50 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 30 Mar 2012 15:44:54 +0200
+Subject: Load distribution search plugins from /etc/<appname>/searchplugins
+
+---
+ .../components/dirprovider/DirectoryProvider.cpp   |   22 ++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp
+index 1373adc..cde4587 100644
+--- a/browser/components/dirprovider/DirectoryProvider.cpp
++++ b/browser/components/dirprovider/DirectoryProvider.cpp
+@@ -38,7 +38,8 @@
+ #include "nsIDirectoryService.h"
+ #include "DirectoryProvider.h"
+ 
+-#include "nsIFile.h"
++#include "nsIXULAppInfo.h"
++#include "nsILocalFile.h"
+ #include "nsISimpleEnumerator.h"
+ #include "nsIPrefService.h"
+ #include "nsIPrefBranch.h"
+@@ -166,13 +167,22 @@ AppendFileKey(const char *key, nsIProperties* aDirSvc,
+ static void
+ AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array)
+ {
+-  nsCOMPtr<nsIFile> searchPlugins;
+-  nsresult rv = aDirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
+-                             NS_GET_IID(nsIFile),
+-                             getter_AddRefs(searchPlugins));
++  nsCOMPtr<nsILocalFile> searchPlugins;
++  nsresult rv = NS_NewLocalFile(NS_LITERAL_STRING("/etc"), false,
++                                getter_AddRefs(searchPlugins));
+   if (NS_FAILED(rv))
+     return;
+-  searchPlugins->AppendNative(NS_LITERAL_CSTRING("distribution"));
++  nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
++  if (!appInfo)
++    return;
++
++  nsCAutoString name;
++  rv = appInfo->GetName(name);
++  if (NS_FAILED(rv))
++    return;
++  ToLowerCase(name);
++
++  searchPlugins->AppendNative(name);
+   searchPlugins->AppendNative(NS_LITERAL_CSTRING("searchplugins"));
+ 
+   bool exists;