iceweasel-branding.patch

   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
   4 @@ -36,8 +36,8 @@
   5  #
   6  # ***** END LICENSE BLOCK *****
   7
   8 -MOZ_APP_BASENAME=Firefox
   9 -MOZ_APP_VENDOR=Mozilla
  10 +MOZ_APP_BASENAME=Iceweasel
  11 +MOZ_APP_VENDOR=
  12  MOZ_UPDATER=1
  13  MOZ_PHOENIX=1
  14
  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
  18  MOZ_OFFICIAL_BRANDING
  19
  20 ---
  21  browser/app/Makefile.in                          |    4 ++++
  22  browser/app/profile/firefox.js                   |    4 ++++
  23  browser/components/safebrowsing/Makefile.in      |    4 ++++
  24  browser/components/safebrowsing/SafeBrowsing.jsm |    4 ++++
  25  4 files changed, 16 insertions(+)
  26
  27 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
  28 index 5f891ca..e337ef4 100644
  29 --- a/browser/app/Makefile.in
  30 +++ b/browser/app/Makefile.in
  31 @@ -132,6 +132,10 @@ endif
  32
  33  endif #} LIBXUL_SDK
  34
  35 +ifdef MOZ_OFFICIAL_BRANDING
  36 +DEFINES += -DMOZ_OFFICIAL_BRANDING
  37 +endif
  38 +
  39  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  40  libs::
  41         $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
  42 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
  43 index d02a1b1..2b0b9fd 100644
  44 --- a/browser/app/profile/firefox.js
  45 +++ b/browser/app/profile/firefox.js
  46 @@ -742,7 +742,11 @@ pref("urlclassifier.gethashnoise", 4);
  47  pref("urlclassifier.randomizeclient", false);
  48
  49  // The list of tables that use the gethash request to confirm partial results.
  50 +#ifdef MOZ_OFFICIAL_BRANDING
  51  pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
  52 +#else
  53 +pref("urlclassifier.gethashtables", "googpub-phish-shavar,goog-malware-shavar");
  54 +#endif
  55
  56  // If an urlclassifier table has not been updated in this number of seconds,
  57  // a gethash request will be forced to check that the result is still in
  58 diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in
  59 index 8585a34..3aceb9f 100644
  60 --- a/browser/components/safebrowsing/Makefile.in
  61 +++ b/browser/components/safebrowsing/Makefile.in
  62 @@ -24,4 +24,8 @@ EXTRA_PP_JS_MODULES = \
  63    SafeBrowsing.jsm \
  64    $(NULL)
  65
  66 +ifdef MOZ_OFFICIAL_BRANDING
  67 +DEFINES += -DMOZ_OFFICIAL_BRANDING
  68 +endif
  69 +
  70  include $(topsrcdir)/config/rules.mk
  71 diff --git a/browser/components/safebrowsing/SafeBrowsing.jsm b/browser/components/safebrowsing/SafeBrowsing.jsm
  72 index 313ac48..ba9b6f4 100644
  73 --- a/browser/components/safebrowsing/SafeBrowsing.jsm
  74 +++ b/browser/components/safebrowsing/SafeBrowsing.jsm
  75 @@ -10,7 +10,11 @@ const Cu = Components.utils;
  76
  77  Cu.import("resource://gre/modules/Services.jsm");
  78
  79 +#ifdef MOZ_OFFICIAL_BRANDING
  80  const phishingList = "goog-phish-shavar";
  81 +#else
  82 +const phishingList = "googpub-phish-shavar";
  83 +#endif
  84  const malwareList  = "goog-malware-shavar";
  85
  86  var debug = false;
  87 From: Mike Hommey <mh@glandium.org>
  88 Date: Sat, 19 Feb 2011 11:04:53 +0100
  89 Subject: Modify search plugins depending on MOZ_APP_NAME
  90
  91 ---
  92  browser/locales/Makefile.in                     |    1 +
  93  browser/locales/en-US/searchplugins/answers.xml |    2 +-
  94  browser/locales/en-US/searchplugins/google.xml  |    5 +++++
  95  3 files changed, 7 insertions(+), 1 deletion(-)
  96
  97 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
  98 index 340bb5f..dd0761f 100644
  99 --- a/browser/locales/Makefile.in
 100 +++ b/browser/locales/Makefile.in
 101 @@ -167,6 +167,7 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 102         for SEARCH_PLUGIN in $^; do\
 103           SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
 104           $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
 105 +        -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 106             $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \
 107         done
 108
 109 diff --git a/browser/locales/en-US/searchplugins/answers.xml b/browser/locales/en-US/searchplugins/answers.xml
 110 index ea32303..2da83aa 100644
 111 --- a/browser/locales/en-US/searchplugins/answers.xml
 112 +++ b/browser/locales/en-US/searchplugins/answers.xml
 113 @@ -8,6 +8,6 @@
 114    <Param name="gwp" value="13"/>
 115  </Url>
 116  <Url type="application/x-suggestions+json" method="GET"
 117 -     template="http://www.answers.com/main/startswith?output=json&amp;client=firefox&amp;s={searchTerms}"/>
 118 +#expand     template="http://www.answers.com/main/startswith?output=json&amp;client=__MOZ_APP_NAME__&amp;s={searchTerms}"/>
 119  <SearchForm>http://www.answers.com/</SearchForm>
 120  </SearchPlugin>
 121 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
 122 index 1ccd459..b87c867 100644
 123 --- a/browser/locales/en-US/searchplugins/google.xml
 124 +++ b/browser/locales/en-US/searchplugins/google.xml
 125 @@ -1,7 +1,9 @@
 126     - License, v. 2.0. If a copy of the MPL was not distributed with this
 127     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 128
 129 +#filter substitution
 130  #define GOOGLE_PARAMS <Param name="q" value="{searchTerms}"/><Param name="ie" value="utf-8"/><Param name="oe" value="utf-8"/><Param name="aq" value="t"/><Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
 131 +#if MOZ_APP_NAME==firefox
 132  #if MOZ_UPDATE_CHANNEL == beta
 133  #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
 134  #elif MOZ_UPDATE_CHANNEL == aurora
 135 @@ -8,6 +10,9 @@
 136  #else
 137  #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
 138  #endif
 139 +#else
 140 +#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="@MOZ_APP_NAME@-a" falseValue="@MOZ_APP_NAME@"/>
 141 +#endif
 142  <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 143  <ShortName>Google</ShortName>
 144  <Description>Google Search</Description>
 145 From: Mike Hommey <mh@glandium.org>
 146 Date: Sat, 19 Feb 2011 11:02:30 +0100
 147 Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
 148
 149 ---
 150  browser/locales/Makefile.in                        |    2 ++
 151  .../en-US/chrome/overrides/appstrings.properties   |   20 ++++++++++----------
 152  2 files changed, 12 insertions(+), 10 deletions(-)
 153
 154 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 155 index c5a09d2..340bb5f 100644
 156 --- a/browser/locales/Makefile.in
 157 +++ b/browser/locales/Makefile.in
 158 @@ -69,6 +69,8 @@ SUBMAKEFILES += \
 159         $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
 160         $(NULL)
 161
 162 +DEFINES += -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME)
 163 +
 164  # This makefile uses variable overrides from the libs-% target to
 165  # build non-default locales to non-default dist/ locations. Be aware!
 166
 167 diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
 168 index 87e9538..ac979f9 100644
 169 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties
 170 +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
 171 @@ -35,24 +35,24 @@
 172  # ***** END LICENSE BLOCK *****
 173
 174  malformedURI=The URL is not valid and cannot be loaded.
 175 -fileNotFound=Firefox can't find the file at %S.
 176 -dnsNotFound=Firefox can't find the server at %S.
 177 -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
 178 -connectionFailure=Firefox can't establish a connection to the server at %S.
 179 +#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S.
 180 +#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S.
 181 +#expand protocolNotFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
 182 +#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S.
 183  netInterrupt=The connection to %S was interrupted while the page was loading.
 184  netTimeout=The server at %S is taking too long to respond.
 185 -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
 186 +#expand redirectLoop=__MOZ_APP_DISPLAYNAME__ has detected that the server is redirecting the request for this address in a way that will never complete.
 187  ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
 188  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.
 189  resendButton.label=Resend
 190 -unknownSocketType=Firefox doesn't know how to communicate with the server.
 191 +#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn't know how to communicate with the server.
 192  netReset=The connection to the server was reset while the page was loading.
 193  notCached=This document is no longer available.
 194 -netOffline=Firefox is currently in offline mode and can't browse the Web.
 195 +#expand netOffline=__MOZ_APP_DISPLAYNAME__ is currently in offline mode and can't browse the Web.
 196  isprinting=The document cannot change while Printing or in Print Preview.
 197 -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.
 198 -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found.
 199 -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
 200 +#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.
 201 +#expand proxyResolveFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that can't be found.
 202 +#expand proxyConnectFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that is refusing connections.
 203  contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
 204  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.
 205  externalProtocolTitle=External Protocol Request