Re: IceCat "pref" duplicated

[Giuseppe Scrivano]

Hello Christophe,

thanks to have reported it, I am going to remove duplicate lines.  I
have appended the patch I am going to commit.

Giuseppe


Index: browser/app/profile/firefox.js
===================================================================
--- browser/app/profile/firefox.js      (revisione 123)
+++ browser/app/profile/firefox.js      (copia locale)
@@ -570,9 +570,6 @@
 // Disable the default plugin for firefox
 pref("plugin.default_plugin_disabled", true);
 
-// plugin finder service url
-pref("pfs.datasource.url", 
"http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%";);
-
 // by default we show an infobar message when pages require plugins the user 
has not installed, or are outdated
 pref("plugins.hide_infobar_for_missing_plugin", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
Index: browser/branding/unofficial/pref/firefox-branding.js
===================================================================
--- browser/branding/unofficial/pref/firefox-branding.js        (revisione 123)
+++ browser/branding/unofficial/pref/firefox-branding.js        (copia locale)
@@ -9,14 +9,6 @@
 // supplied in the "An update is available" page of the update wizard. 
 pref ("app.update.url.details", "http://gnuzilla.gnu.org/";);
 
-// Release notes URL
-pref ("app.releaseNotesURL", "http://gnuzilla.gnu.org/";);
-
-// Search codes belong only in builds with official branding
-pref ("browser.search.param.yahoo-fr", "");
-pref ("browser.search.param.yahoo-fr-cjkt", "");
-pref ("browser.search.param.yahoo-f-CN", "");
-
 pref ("pfs.datasource.url", 
"http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%";);




Christophe Jarry <address@hidden> writes:

> Dear developers,
>
> Today I found your file
> http://svn.savannah.gnu.org/viewvc/trunk/icecat/browser/branding/unofficial/pref/firefox-branding.js
> contained two duplicated preferences:
>
>   // Release notes URL
>   pref ("app.releaseNotesURL", "http://gnuzilla.gnu.org/";);
>
> and:
>
>   // Search codes belong only in builds with official branding
>   pref ("browser.search.param.yahoo-fr", "");
>   pref ("browser.search.param.yahoo-fr-cjkt", "");
>   pref ("browser.search.param.yahoo-f-CN", "");
>
> There is also a space between "pref" and "(" in all the preferences
> of this file while most of the Mozilla code I browsed had "pref(".
>
> Moreover, the line
>
>   pref ("pfs.datasource.url",
> "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%";);
>
> is already present in
> http://svn.savannah.gnu.org/viewvc/trunk/icecat/browser/app/profile/firefox.js?root=gnuzilla&view=markup.
>
> Please correct this.
>
> Christophe
>
> --
> http://gnuzilla.gnu.org