---- icedove-3.0.old/comm-1.9.1/mozilla/configure.orig 2009-12-18 15:06:50.144206912 +0100
-+++ icedove-3.0.old/comm-1.9.1/mozilla/configure 2009-12-18 15:07:35.791285838 +0100
-@@ -13390,8 +13390,8 @@
- ;;
-
- standalone)
-- MOZ_APP_NAME=mozilla
-- MOZ_APP_DISPLAYNAME=Mozilla
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_APP_VERSION=$MOZILLA_VERSION
- ;;
-
---- icedove-3.0.old/comm-1.9.1/mozilla/configure.in.orig 2009-12-18 15:07:49.984408790 +0100
-+++ icedove-3.0.old/comm-1.9.1/mozilla/configure.in 2009-12-18 15:08:12.906912163 +0100
-@@ -4664,8 +4664,8 @@
- ;;
-
- standalone)
-- MOZ_APP_NAME=mozilla
-- MOZ_APP_DISPLAYNAME=Mozilla
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_APP_VERSION=$MOZILLA_VERSION
- ;;
-
---- icedove-3.0.old/comm-1.9.1/mail/confvars.sh 2009-12-05 02:53:48.000000000 +0100
-+++ icedove-3.0/comm-1.9.1.new/mail/confvars.sh 2009-12-21 09:55:06.346526172 +0100
-@@ -36,7 +36,7 @@
- #
- # ***** END LICENSE BLOCK *****
+--- 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
+ [App]
+-Name=Thunderbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+--- 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);
+
+ // 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
+@@ -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.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", "");
+
+@@ -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);
+ 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
+-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
+
+@@ -391,7 +391,7 @@
+
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-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:
+@@ -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%");
+
+ // 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();"/>
+- <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 -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/branding.nsi icedove-3.0/comm-1.9.1/mail/branding/nightly/branding.nsi
---- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/branding.nsi 2010-01-13 12:50:52.355011705 +0100
-+++ icedove-3.0/comm-1.9.1/mail/branding/nightly/branding.nsi 2010-01-13 12:52:49.625208158 +0100
-@@ -39,7 +39,7 @@
-
- # BrandFullNameInternal is used for some registry and file system values
- # instead of BrandFullName and typically should not be modified.
--!define BrandFullNameInternal "Shredder"
-+!define BrandFullNameInternal "Icedove"
- !define CompanyName "mozilla.org"
- !define URLInfoAbout "http://www.mozilla.org/"
- !define URLUpdateInfo "http://www.mozilla.org/products/thunderbird/"
-diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/configure.sh icedove-3.0/comm-1.9.1/mail/branding/nightly/configure.sh
---- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/configure.sh 2010-01-13 12:50:52.355011705 +0100
-+++ icedove-3.0/comm-1.9.1/mail/branding/nightly/configure.sh 2010-01-13 12:52:49.625208158 +0100
-@@ -1 +1 @@
--MOZ_APP_DISPLAYNAME=Shredder
-+MOZ_APP_DISPLAYNAME=Icedove
-diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd
---- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd 2010-01-13 12:50:52.358344857 +0100
-+++ icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.dtd 2010-01-13 12:53:00.268553944 +0100
-@@ -1,3 +1,3 @@
--<!ENTITY brandShortName "Shredder">
--<!ENTITY brandFullName "Shredder">
-+<!ENTITY brandShortName "Icedove">
-+<!ENTITY brandFullName "Icedove">
- <!ENTITY vendorShortName "mozilla.org">
-diff -ru icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties
---- icedove-3.0.old/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties 2010-01-13 12:50:52.358344857 +0100
-+++ icedove-3.0/comm-1.9.1/mail/branding/nightly/locales/en-US/brand.properties 2010-01-13 12:53:00.268553944 +0100
-@@ -1,4 +1,4 @@
--brandShortName=Shredder
--brandFullName=Shredder
-+brandShortName=Icedove
-+brandFullName=Icedove
- vendorShortName=mozilla.org
-
-diff -ru icedove-3.0.old/comm-1.9.1/mail/installer/windows/nsis/shared.nsh icedove-3.0/comm-1.9.1/mail/installer/windows/nsis/shared.nsh
---- icedove-3.0.old/comm-1.9.1/mail/installer/windows/nsis/shared.nsh 2010-01-13 12:50:52.375011483 +0100
-+++ icedove-3.0/comm-1.9.1/mail/installer/windows/nsis/shared.nsh 2010-01-13 12:53:13.349789738 +0100
-@@ -518,19 +518,19 @@
- DeleteRegKey HKCU "$0\.eml\DefaultIcon"
- ${EndUnless}
-
-- ; Remove the Shredder clients key if its default icon contains thunderbird.exe
-+ ; Remove the Icedove clients key if its default icon contains thunderbird.exe
- ClearErrors
-- ReadRegStr $1 HKLM "SOFTWARE\clients\mail\Shredder\DefaultIcon" ""
-+ ReadRegStr $1 HKLM "SOFTWARE\clients\mail\Icedove\DefaultIcon" ""
- ${WordFind} "$1" "${FileMainEXE}" "E+1{" $R1
- ${Unless} ${Errors}
-- DeleteRegKey HKLM "SOFTWARE\clients\mail\Shredder"
-+ DeleteRegKey HKLM "SOFTWARE\clients\mail\Icedove"
- ${EndUnless}
-
- ClearErrors
-- ReadRegStr $1 HKLM "SOFTWARE\clients\news\Shredder\DefaultIcon" ""
-+ ReadRegStr $1 HKLM "SOFTWARE\clients\news\Icedove\DefaultIcon" ""
- ${WordFind} "$1" "${FileMainEXE}" "E+1{" $R1
- ${Unless} ${Errors}
-- DeleteRegKey HKLM "SOFTWARE\clients\news\Shredder"
-+ DeleteRegKey HKLM "SOFTWARE\clients\news\Icedove"
- ${EndUnless}
-
- ; The Vista shim for 1.5.0.10 writes out a set of bogus keys which we need to
+ 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()
+ {
+- printf("%s %s %s",
+- gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
++ printf("%s %s", gAppData->name, gAppData->version);
+ if (gAppData->copyright)
+ printf(", %s", gAppData->copyright);
+ printf("\n");
projects / packages / icedove.git / blobdiff