icedove-branding.patch

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