icedove-branding.patch

   1 diff -urN mozilla.orig/mail/app/application.ini mozilla/mail/app/application.ini
   2 --- mozilla.orig/mail/app/application.ini       2010-01-11 18:40:34.000000000 +0100
   3 +++ mozilla/mail/app/application.ini    2010-02-12 19:52:36.000000000 +0100
   4 @@ -37,7 +37,7 @@
   5
   6  #filter substitution
   7  [App]
   8 -Name=Thunderbird
   9 +Name=Icedove
  10  Version=@APP_VERSION@
  11  BuildID=@GRE_BUILDID@
  12  #ifdef MOZ_SOURCE_REPO
  13 diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
  14 --- mozilla.orig/mail/app/profile/all-thunderbird.js    2010-01-11 18:40:34.000000000 +0100
  15 +++ mozilla/mail/app/profile/all-thunderbird.js 2010-02-11 22:05:58.000000000 +0100
  16 @@ -73,7 +73,7 @@
  17  // App-specific update preferences
  18
  19  // Whether or not app updates are enabled
  20 -pref("app.update.enabled", true);
  21 +pref("app.update.enabled", false);
  22
  23  // This preference turns on app.update.mode and allows automatic download and
  24  // install to take place. We use a separate boolean toggle for this to make
  25 @@ -98,10 +98,10 @@
  26
  27  // URL user can browse to manually if for some reason all update installation
  28  // attempts fail.  TODO: Change this URL
  29 -pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
  30 +pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/");
  31  // A default value for the "More information about this update" link
  32  // supplied in the "An update is available" page of the update wizard.
  33 -pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/%APP%/releases/");
  34 +pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/");
  35  // User-settable override to app.update.url for testing purposes.
  36  //pref("app.update.url.override", "");
  37
  38 @@ -127,10 +127,10 @@
  39  pref("app.update.showInstalledUI", false);
  40
  41  // Release notes URL
  42 -pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
  43 +pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
  44
  45  // Base URL for web-based support pages.
  46 -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
  47 +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
  48
  49  // Blocklist preferences
  50  pref("extensions.blocklist.enabled", true);
  51 @@ -158,9 +158,9 @@
  52  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
  53                                              // Themes every day
  54  // Non-symmetric (not shared by extensions) extension-specific [update] preferences
  55 -pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
  56 -pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
  57 -pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
  58 +pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
  59 +pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
  60 +pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/plugins/");
  61  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
  62  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
  63
  64 @@ -169,12 +169,12 @@
  65
  66  // Preferences for the Get Add-ons pane
  67  pref("extensions.getAddons.showPane", true);
  68 -pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%");
  69 +pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird");
  70  pref("extensions.getAddons.maxResults", 5);
  71 -pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended");
  72 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
  73 -pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%");
  74 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
  75 +pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/recommended");
  76 +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
  77 +pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/search?q=%TERMS%");
  78 +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
  79
  80  pref("xpinstall.whitelist.add", "update.mozilla.org");
  81  pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
  82 @@ -361,7 +361,7 @@
  83  pref("news.directory",                  "");
  84  pref("spellchecker.dictionary", "");
  85  // Dictionary download preference
  86 -pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/");
  87 +pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/dictionaries/");
  88
  89  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
  90  // mail application without any user intervention. Possible values are:
  91 @@ -491,7 +491,7 @@
  92  pref("mailnews.database.global.logging.console", true);
  93
  94  // page to load to find good header add-ons
  95 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
  96 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
  97
  98  // What level of warning should we send to the error console?
  99  pref("mail.wizard.logging.console", "None");
 100 diff -urN mozilla.orig/mail/base/content/baseMenuOverlay.xul mozilla/mail/base/content/baseMenuOverlay.xul
 101 --- mozilla.orig/mail/base/content/baseMenuOverlay.xul  2010-01-11 18:40:34.000000000 +0100
 102 +++ mozilla/mail/base/content/baseMenuOverlay.xul       2010-02-11 22:05:58.000000000 +0100
 103 @@ -70,9 +70,6 @@
 104                  oncommand="openSupportURL();"
 105                  key="key_openHelp"/>
 106  #endif
 107 -      <menuitem id="releaseNotes"
 108 -                label="&releaseCmd.label;" accesskey="&releaseCmd.accesskey;"
 109 -                oncommand="openFormattedURL('app.releaseNotesURL');"/>
 110        <menuitem id="whatsNew"
 111                  label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
 112                  oncommand="openWhatsNew();"/>
 113 diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
 114 --- mozilla.orig/mail/base/content/credits.xhtml        2010-01-11 18:40:34.000000000 +0100
 115 +++ mozilla/mail/base/content/credits.xhtml     2010-02-11 22:05:58.000000000 +0100
 116 @@ -216,7 +216,7 @@
 117      </div>
 118
 119      <div id="creditsBox">
 120 -        <h2 class="title">&brandFullName;&trade;
 121 +        <h2 class="title">&brandFullName;
 122            <div class="motto">&brandMotto;</div>
 123          </h2>
 124
 125 @@ -329,19 +329,13 @@
 126          <p id="gecko" class="center">&credit.poweredByGecko;</p>
 127
 128          <p class="footnote">
 129 -          &brandFullName;&trade; &license.part0; &copy;1998-2010 &license.part1;
 130 +          &brandFullName; &license.part0; &copy;1998-2010 &license.part1;
 131            <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
 132            &license.part2;
 133            <a href="" onclick="openLicense(); event.preventDefault();">license</a>
 134            &license.part3;</p>
 135
 136          <p class="footnote">
 137 -          Mozilla Thunderbird&trade; and the Thunderbird logo are trademarks of the Mozilla
 138 -          Foundation. You are not granted rights or licenses to the trademarks
 139 -          of the Mozilla Foundation or any party, including without limitation the
 140 -          Thunderbird name or logo.</p>
 141 -
 142 -        <p class="footnote">
 143            U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
 144            as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
 145            &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
 146 diff -urN mozilla.orig/mail/build.mk mozilla/mail/build.mk
 147 --- mozilla.orig/mail/build.mk  2010-01-11 18:40:34.000000000 +0100
 148 +++ mozilla/mail/build.mk       2010-02-11 22:05:58.000000000 +0100
 149 @@ -112,11 +112,11 @@
 150  APP_NAME := $(APP_NAME)Debug
 151  endif
 152  PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
 153 -PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
 154 +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 155  else
 156  # Non-mac options
 157  PROGRAM_LOCATION = ../../../$(DIST)/bin/
 158 -PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
 159 +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)$(BIN_SUFFIX)
 160  endif
 161
 162  mozmill::
 163 diff -urN mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp
 164 --- mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp       2010-01-11 18:40:34.000000000 +0100
 165 +++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp    2010-02-12 19:56:28.000000000 +0100
 166 @@ -94,7 +94,7 @@
 167                                getter_AddRefs(appPath));
 168    NS_ENSURE_SUCCESS(rv, rv);
 169
 170 -  rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird"));
 171 +  rv = appPath->AppendNative(NS_LITERAL_CSTRING("icedove"));
 172    NS_ENSURE_SUCCESS(rv, rv);
 173
 174    rv = appPath->GetNativePath(mAppPath);
 175 diff -urN mozilla.orig/mail/confvars.sh mozilla/mail/confvars.sh
 176 --- mozilla.orig/mail/confvars.sh       2010-01-11 18:40:34.000000000 +0100
 177 +++ mozilla/mail/confvars.sh    2010-02-11 22:05:58.000000000 +0100
 178 @@ -36,7 +36,7 @@
 179  #
 180  # ***** END LICENSE BLOCK *****
 181
 182 -MOZ_APP_NAME=thunderbird
 183 +MOZ_APP_NAME=icedove
 184  MOZ_UPDATER=1
 185  MOZ_THUNDERBIRD=1
 186  MOZ_NO_ACTIVEX_SUPPORT=1
 187 diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
 188 --- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd    2010-01-11 18:40:34.000000000 +0100
 189 +++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2010-02-11 22:05:58.000000000 +0100
 190 @@ -2,9 +2,7 @@
 191  <!ENTITY aboutButton.label      "&lt; Back">
 192  <!ENTITY aboutButton.accesskey  "B">
 193  <!ENTITY aboutVersion           "version">
 194 -<!ENTITY copyrightText          "&#169;1998-2010 Contributors. All Rights Reserved. Mozilla Thunderbird and the
 195 -                                 Thunderbird logos are trademarks of the Mozilla Foundation.  All rights
 196 -                                 reserved.">
 197 +<!ENTITY copyrightText          "&#169;1998-2010 Contributors. All Rights Reserved.">
 198  <!ENTITY aboutMenu.label        "About">
 199  <!ENTITY aboutMenu.accesskey    "A">
 200  <!ENTITY aboutCredits.label     "Credits">
 201 diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
 202 --- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd        2010-01-11 18:40:34.000000000 +0100
 203 +++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd     2010-02-11 22:05:58.000000000 +0100
 204 @@ -1,5 +1,5 @@
 205  <!ENTITY credit.title     "&brandFullName; Credits">
 206 -<!ENTITY brandMotto       "Thunderbirds Are Go!">
 207 +<!ENTITY brandMotto       "Icedoves Are Free!">
 208  <!ENTITY credit.thanks    "Special Thanks To">
 209
 210  <!-- localization credits look like this: -->
 211 diff -urN mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp
 212 --- mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp    2010-01-11 18:43:15.000000000 +0100
 213 +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2010-02-11 22:05:58.000000000 +0100
 214 @@ -1236,8 +1236,7 @@
 215  static inline void
 216  DumpVersion()
 217  {
 218 -  printf("%s %s %s",
 219 -         gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
 220 +  printf("%s %s", gAppData->name, gAppData->version);
 221    if (gAppData->copyright)
 222        printf(", %s", gAppData->copyright);
 223    printf("\n");