1 diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
2 --- mozilla.orig/browser/confvars.sh 2010-02-04 15:47:13.000000000 +0100
3 +++ mozilla/browser/confvars.sh 2010-02-04 15:48:50.000000000 +0100
6 # ***** END LICENSE BLOCK *****
8 -MOZ_APP_BASENAME=Firefox
9 -MOZ_APP_VENDOR=Mozilla
10 +MOZ_APP_BASENAME=Iceweasel
15 From: Mike Hommey <mh@glandium.org>
16 Date: Thu, 1 Apr 2010 15:34:59 +0200
17 Subject: Determine which phishing shavar to use depending on
21 browser/app/Makefile.in | 4 ++++
22 browser/app/profile/firefox.js | 4 ++++
23 2 files changed, 8 insertions(+)
25 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
26 index fdcee86..3c6cb9f 100644
27 --- a/browser/app/Makefile.in
28 +++ b/browser/app/Makefile.in
29 @@ -141,6 +141,10 @@ libs::
30 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default
33 +ifdef MOZ_OFFICIAL_BRANDING
34 +DEFINES += -DMOZ_OFFICIAL_BRANDING
37 libs:: $(srcdir)/profile/prefs.js
38 $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
40 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
41 index 02c8e3f..979e01a 100644
42 --- a/browser/app/profile/firefox.js
43 +++ b/browser/app/profile/firefox.js
44 @@ -760,7 +760,11 @@ pref("urlclassifier.alternate_error_page", "blocked");
45 pref("urlclassifier.gethashnoise", 4);
47 // The list of tables that use the gethash request to confirm partial results.
48 +#ifdef MOZ_OFFICIAL_BRANDING
49 pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
51 +pref("urlclassifier.gethashtables", "googpub-phish-shavar,goog-malware-shavar");
54 // If an urlclassifier table has not been updated in this number of seconds,
55 // a gethash request will be forced to check that the result is still in
56 From: Mike Hommey <mh@glandium.org>
57 Date: Sat, 19 Feb 2011 11:04:53 +0100
58 Subject: Modify search plugins depending on MOZ_APP_NAME
61 browser/locales/Makefile.in | 2 ++
62 browser/locales/en-US/searchplugins/answers.xml | 2 +-
63 browser/locales/en-US/searchplugins/google.xml | 5 +++++
64 3 files changed, 8 insertions(+), 1 deletion(-)
66 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
67 index 07a105e..fa8ea25 100644
68 --- a/browser/locales/Makefile.in
69 +++ b/browser/locales/Makefile.in
70 @@ -83,6 +83,8 @@ SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
71 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
72 PP_TARGETS += SEARCHPLUGINS
74 +DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME)
76 # Required for l10n.mk - defines a list of app sub dirs that should
77 # be included in langpack xpis.
79 diff --git a/browser/locales/en-US/searchplugins/answers.xml b/browser/locales/en-US/searchplugins/answers.xml
80 index f131ea6..357d42e 100644
81 --- a/browser/locales/en-US/searchplugins/answers.xml
82 +++ b/browser/locales/en-US/searchplugins/answers.xml
84 <Param name="gwp" value="13"/>
86 <Url type="application/x-suggestions+json" method="GET"
87 - template="http://www.answers.com/main/startswith?output=json&client=firefox&s={searchTerms}"/>
88 +#expand template="http://www.answers.com/main/startswith?output=json&client=__MOZ_APP_NAME__&s={searchTerms}"/>
89 <SearchForm>http://www.answers.com/</SearchForm>
91 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
92 index 10ba30b..f23b99e 100644
93 --- a/browser/locales/en-US/searchplugins/google.xml
94 +++ b/browser/locales/en-US/searchplugins/google.xml
96 - License, v. 2.0. If a copy of the MPL was not distributed with this
97 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
100 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
101 <ShortName>Google</ShortName>
102 <Description>Google Search</Description>
104 <Param name="oe" value="utf-8"/>
105 <Param name="aq" value="t"/>
106 <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
107 +#if MOZ_APP_NAME==firefox
108 #if MOZ_UPDATE_CHANNEL == beta
109 <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
110 #elif MOZ_UPDATE_CHANNEL == aurora
113 <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
116 + <MozParam name="client" condition="defaultEngine" trueValue="@MOZ_APP_NAME@-a" falseValue="@MOZ_APP_NAME@"/>
118 <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/>
119 <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/>
120 <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/>
121 From: Mike Hommey <mh@glandium.org>
122 Date: Sat, 19 Feb 2011 11:02:30 +0100
123 Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
126 browser/locales/Makefile.in | 2 ++
127 .../en-US/chrome/overrides/appstrings.properties | 20 ++++++++++----------
128 2 files changed, 12 insertions(+), 10 deletions(-)
130 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
131 index cfaa3db..07a105e 100644
132 --- a/browser/locales/Makefile.in
133 +++ b/browser/locales/Makefile.in
134 @@ -37,6 +37,8 @@ SUBMAKEFILES += \
135 $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
138 +DEFINES += -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME)
140 # This makefile uses variable overrides from the libs-% target to
141 # build non-default locales to non-default dist/ locations. Be aware!
143 diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
144 index 1de0093..8c77825 100644
145 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties
146 +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
148 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
150 malformedURI=The URL is not valid and cannot be loaded.
151 -fileNotFound=Firefox can't find the file at %S.
152 -dnsNotFound=Firefox can't find the server at %S.
153 -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
154 -connectionFailure=Firefox can't establish a connection to the server at %S.
155 +#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S.
156 +#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S.
157 +#expand protocolNotFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
158 +#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S.
159 netInterrupt=The connection to %S was interrupted while the page was loading.
160 netTimeout=The server at %S is taking too long to respond.
161 -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
162 +#expand redirectLoop=__MOZ_APP_DISPLAYNAME__ has detected that the server is redirecting the request for this address in a way that will never complete.
163 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
164 confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
165 resendButton.label=Resend
166 -unknownSocketType=Firefox doesn't know how to communicate with the server.
167 +#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn't know how to communicate with the server.
168 netReset=The connection to the server was reset while the page was loading.
169 notCached=This document is no longer available.
170 -netOffline=Firefox is currently in offline mode and can't browse the Web.
171 +#expand netOffline=__MOZ_APP_DISPLAYNAME__ is currently in offline mode and can't browse the Web.
172 isprinting=The document cannot change while Printing or in Print Preview.
173 -deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection.
174 -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found.
175 -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
176 +#expand deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. __MOZ_APP_DISPLAYNAME__ has canceled the request for your protection.
177 +#expand proxyResolveFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that can't be found.
178 +#expand proxyConnectFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that is refusing connections.
179 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
180 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
181 externalProtocolTitle=External Protocol Request