Bug 289076 - plugin finder URL should not be localizable. r/a=bsmedberg

browser/app/profile/firefox.js

@@ -344,8 +344,8 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 // Disable the default plugin for firefox
 pref("plugin.default_plugin_disabled", true);
 
-// plugin finder service
-pref("pfs.datasource.url", "chrome://mozapps/locale/plugins/plugins.properties");
+// plugin finder service url
+pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
 
 #ifdef XP_WIN
 pref("browser.preferences.instantApply", false);

toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties

@@ -22,5 +22,3 @@ pluginInstallation.unknownPlugin=Unknown Plugin
 
 missingPlugin.label=Click here to download plugin.
 
-pfs.datasource.url=https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%
-

toolkit/mozapps/plugins/content/pluginInstallerDatasource.js

@@ -1,3 +1,40 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Plugin Finder Service.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the IBM Corporation are Copyright (C) 2004-2005
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doron Rosenberg <doronr@us.ibm.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
 const RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 const PFS_NS = "http://www.mozilla.org/2004/pfs-rdf#";
 
@@ -17,8 +54,7 @@ function nsRDFItemUpdater(aClientOS, aChromeLocale){
 
   var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
                              .getService(Components.interfaces.nsIPrefBranch);
-  this.dsURI = prefBranch.getComplexValue("pfs.datasource.url",
-                                     Components.interfaces.nsIPrefLocalizedString).data;
+  this.dsURI = prefBranch.getCharPref("pfs.datasource.url");
 }
 
 nsRDFItemUpdater.prototype = {