-diff -urN mozilla.orig/mail/app/application.ini mozilla/mail/app/application.ini
---- mozilla.orig/mail/app/application.ini 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/app/application.ini 2010-02-12 19:52:36.000000000 +0100
+--- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200
+@@ -28,7 +28,7 @@
+ <em:id>@XPI_EM_ID@</em:id>
+ <em:name>Lightning</em:name>
+ <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
+- <em:description>An integrated calendar for Thunderbird</em:description>
++ <em:description>An integrated calendar for Icedove</em:description>
+ #ifdef LIGHTNING_PRERELEASE_VERSION
+ <em:developer>Build ID: @GRE_BUILDID@</em:developer>
+ #endif
+--- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200
+@@ -39,7 +39,7 @@
+
+ # addon description:
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
+-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
++extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
+
+ # Lightning branding
+--- mozilla/mail/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/mail/app/application.ini 2011-09-17 15:24:45.833226544 +0200
@@ -37,7 +37,7 @@
#filter substitution
Version=@APP_VERSION@
BuildID=@GRE_BUILDID@
#ifdef MOZ_SOURCE_REPO
-diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
---- mozilla.orig/mail/app/profile/all-thunderbird.js 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/app/profile/all-thunderbird.js 2010-02-11 22:05:58.000000000 +0100
-@@ -73,7 +73,7 @@
- // App-specific update preferences
+--- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100
++++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100
+@@ -84,7 +84,7 @@
+ pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
-pref("app.update.enabled", true);
-+pref("app.update.enabled", false);
++pref("app.update.enabled", false);
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
-@@ -98,10 +98,10 @@
-
- // URL user can browse to manually if for some reason all update installation
- // attempts fail. TODO: Change this URL
--pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
-+pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/");
+@@ -117,7 +117,7 @@
+ pref("app.update.url.manual", "http://www.getthunderbird.com");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
--pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/%APP%/releases/");
-+pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/");
+-pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/");
// User-settable override to app.update.url for testing purposes.
//pref("app.update.url.override", "");
-@@ -127,10 +127,10 @@
- pref("app.update.showInstalledUI", false);
-
- // Release notes URL
--pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+@@ -139,7 +139,7 @@
+ #endif
// Base URL for web-based support pages.
-pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
+pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
+ // Controls enabling of the extension system logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -161,18 +161,18 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
+
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
-@@ -158,9 +158,9 @@
+ pref("extensions.blocklist.interval", 86400);
+ pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
+-pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
+-pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
++pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
++pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
+
+ // Enables some extra Extension System Logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -190,7 +190,7 @@
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
--pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
--pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
-+pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
-+pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
-+pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/plugins/");
+
+-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/themes/");
++pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
-@@ -169,12 +169,12 @@
-
- // Preferences for the Get Add-ons pane
- pref("extensions.getAddons.showPane", true);
--pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%");
-+pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird");
- pref("extensions.getAddons.maxResults", 5);
--pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
-+pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/recommended");
-+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
-+pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/search?q=%TERMS%");
-+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
-
- pref("xpinstall.whitelist.add", "update.mozilla.org");
- pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
-@@ -361,7 +361,7 @@
- pref("news.directory", "");
+@@ -391,7 +391,7 @@
+
pref("spellchecker.dictionary", "");
// Dictionary download preference
--pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/");
-+pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/dictionaries/");
+-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
// profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
// mail application without any user intervention. Possible values are:
-@@ -491,7 +491,7 @@
+@@ -540,7 +540,7 @@
pref("mailnews.database.global.logging.console", true);
// page to load to find good header add-ons
-pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
+pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
- // What level of warning should we send to the error console?
- pref("mail.wizard.logging.console", "None");
-diff -urN mozilla.orig/mail/base/content/baseMenuOverlay.xul mozilla/mail/base/content/baseMenuOverlay.xul
---- mozilla.orig/mail/base/content/baseMenuOverlay.xul 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/base/content/baseMenuOverlay.xul 2010-02-11 22:05:58.000000000 +0100
-@@ -70,9 +70,6 @@
- oncommand="openSupportURL();"
- key="key_openHelp"/>
- #endif
-- <menuitem id="releaseNotes"
-- label="&releaseCmd.label;" accesskey="&releaseCmd.accesskey;"
-- oncommand="openFormattedURL('app.releaseNotesURL');"/>
+ // Serif fonts look dated. Switching those language families to sans-serif
+ // where we think it makes sense. Worth investigating for other font families
+@@ -764,7 +764,7 @@
+
+ pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
+ pref("plugins.update.notifyUser", false);
+-pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Windows taskbar support
+ #ifdef XP_WIN
+--- mozilla/mail/base/content/baseMenuOverlay.xul~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/mail/base/content/baseMenuOverlay.xul 2011-09-17 15:29:32.946531066 +0200
+@@ -73,9 +73,6 @@
<menuitem id="whatsNew"
label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
oncommand="openWhatsNew();"/>
-diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
---- mozilla.orig/mail/base/content/credits.xhtml 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/base/content/credits.xhtml 2010-02-11 22:05:58.000000000 +0100
-@@ -216,7 +216,7 @@
- </div>
-
- <div id="creditsBox">
-- <h2 class="title">&brandFullName;™
-+ <h2 class="title">&brandFullName;
- <div class="motto">&brandMotto;</div>
- </h2>
-
-@@ -329,19 +329,13 @@
- <p id="gecko" class="center">&credit.poweredByGecko;</p>
-
- <p class="footnote">
-- &brandFullName;™ &license.part0; ©1998-2010 &license.part1;
-+ &brandFullName; &license.part0; ©1998-2010 &license.part1;
- <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
- &license.part2;
- <a href="" onclick="openLicense(); event.preventDefault();">license</a>
- &license.part3;</p>
-
- <p class="footnote">
-- Mozilla Thunderbird™ and the Thunderbird logo are trademarks of the Mozilla
-- Foundation. You are not granted rights or licenses to the trademarks
-- of the Mozilla Foundation or any party, including without limitation the
-- Thunderbird name or logo.</p>
--
-- <p class="footnote">
- U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
- as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
- “commercial computer software” and “commercial computer software
-diff -urN mozilla.orig/mail/build.mk mozilla/mail/build.mk
---- mozilla.orig/mail/build.mk 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/build.mk 2010-02-11 22:05:58.000000000 +0100
-@@ -112,11 +112,11 @@
- APP_NAME := $(APP_NAME)Debug
- endif
- PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
--PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
-+PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
- else
- # Non-mac options
- PROGRAM_LOCATION = ../../../$(DIST)/bin/
--PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
-+PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)$(BIN_SUFFIX)
- endif
-
- mozmill::
-diff -urN mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp
---- mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp 2010-02-12 19:56:28.000000000 +0100
-@@ -94,7 +94,7 @@
- getter_AddRefs(appPath));
- NS_ENSURE_SUCCESS(rv, rv);
-
-- rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird"));
-+ rv = appPath->AppendNative(NS_LITERAL_CSTRING("icedove"));
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = appPath->GetNativePath(mAppPath);
-diff -urN mozilla.orig/mail/confvars.sh mozilla/mail/confvars.sh
---- mozilla.orig/mail/confvars.sh 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/confvars.sh 2010-02-11 22:05:58.000000000 +0100
-@@ -36,7 +36,7 @@
- #
- # ***** END LICENSE BLOCK *****
-
+- <menuitem id="releaseNotes"
+- label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;"
+- oncommand="openFormattedURL('app.releaseNotesURL');"/>
+ <menuseparator id="functionsSeparator"/>
+ <menuitem id="featureConfigurator"
+ label="&featureConfiguratorCmd.label;"
+--- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
++++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
+@@ -36,8 +36,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_BASENAME=Thunderbird
-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
+MOZ_APP_NAME=icedove
MOZ_UPDATER=1
MOZ_THUNDERBIRD=1
- MOZ_NO_ACTIVEX_SUPPORT=1
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
---- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2010-02-11 22:05:58.000000000 +0100
-@@ -2,9 +2,7 @@
- <!ENTITY aboutButton.label "< Back">
- <!ENTITY aboutButton.accesskey "B">
- <!ENTITY aboutVersion "version">
--<!ENTITY copyrightText "©1998-2010 Contributors. All Rights Reserved. Mozilla Thunderbird and the
-- Thunderbird logos are trademarks of the Mozilla Foundation. All rights
-- reserved.">
-+<!ENTITY copyrightText "©1998-2010 Contributors. All Rights Reserved.">
- <!ENTITY aboutMenu.label "About">
- <!ENTITY aboutMenu.accesskey "A">
- <!ENTITY aboutCredits.label "Credits">
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
---- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd 2010-01-11 18:40:34.000000000 +0100
-+++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2010-02-11 22:05:58.000000000 +0100
-@@ -1,5 +1,5 @@
- <!ENTITY credit.title "&brandFullName; Credits">
--<!ENTITY brandMotto "Thunderbirds Are Go!">
-+<!ENTITY brandMotto "Icedoves Are Free!">
- <!ENTITY credit.thanks "Special Thanks To">
-
- <!-- localization credits look like this: -->
-diff -urN mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp 2010-01-11 18:43:15.000000000 +0100
-+++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2010-02-11 22:05:58.000000000 +0100
-@@ -1236,8 +1236,7 @@
+ MOZ_CHROME_FILE_FORMAT=omni
+--- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~ 2011-08-12 16:16:45.000000000 +0200
++++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200
+@@ -1324,8 +1324,7 @@
static inline void
DumpVersion()
{
projects / packages / icedove.git / blobdiff