1 --- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200
2 +++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200
4 <em:id>@XPI_EM_ID@</em:id>
5 <em:name>Lightning</em:name>
6 <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
7 - <em:description>An integrated calendar for Thunderbird</em:description>
8 + <em:description>An integrated calendar for Icedove</em:description>
9 #ifdef LIGHTNING_PRERELEASE_VERSION
10 <em:developer>Build ID: @GRE_BUILDID@</em:developer>
12 --- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200
13 +++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200
17 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
18 -extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
19 +extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
20 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
23 --- mozilla/mail/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200
24 +++ mozilla/mail/app/application.ini 2011-09-17 15:24:45.833226544 +0200
33 #ifdef MOZ_SOURCE_REPO
34 --- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100
35 +++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100
37 pref("app.update.certs.2.commonName", "aus3.mozilla.org");
39 // Whether or not app updates are enabled
40 -pref("app.update.enabled", true);
41 +pref("app.update.enabled", false);
43 // This preference turns on app.update.mode and allows automatic download and
44 // install to take place. We use a separate boolean toggle for this to make
46 pref("app.update.url.manual", "http://www.getthunderbird.com");
47 // A default value for the "More information about this update" link
48 // supplied in the "An update is available" page of the update wizard.
49 -pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
50 +pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/");
51 // User-settable override to app.update.url for testing purposes.
52 //pref("app.update.url.override", "");
57 // Base URL for web-based support pages.
58 -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
59 +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
61 // Controls enabling of the extension system logging (can reduce performance)
62 pref("extensions.logging.enabled", false);
64 // Preferences for AMO integration
65 pref("extensions.getAddons.cache.enabled", true);
66 pref("extensions.getAddons.maxResults", 15);
67 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
68 -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%");
69 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
70 -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");
71 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
72 +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
73 +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%");
74 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
75 +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");
76 +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
78 // Blocklist preferences
79 pref("extensions.blocklist.enabled", true);
80 pref("extensions.blocklist.interval", 86400);
81 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%/");
82 -pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
83 -pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
84 +pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
85 +pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
87 // Enables some extra Extension System Logging (can reduce performance)
88 pref("extensions.logging.enabled", false);
91 pref("spellchecker.dictionary", "");
92 // Dictionary download preference
93 -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
94 +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
96 // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
97 // mail application without any user intervention. Possible values are:
99 pref("mailnews.database.global.logging.console", true);
101 // page to load to find good header add-ons
102 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
103 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
105 // Serif fonts look dated. Switching those language families to sans-serif
106 // where we think it makes sense. Worth investigating for other font families
109 pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
110 pref("plugins.update.notifyUser", false);
111 -pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
112 +pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
114 // Windows taskbar support
116 --- mozilla/mail/base/content/baseMenuOverlay.xul~ 2011-08-12 15:52:04.000000000 +0200
117 +++ mozilla/mail/base/content/baseMenuOverlay.xul 2011-09-17 15:29:32.946531066 +0200
119 <menuitem id="whatsNew"
120 label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
121 oncommand="openWhatsNew();"/>
122 - <menuitem id="releaseNotes"
123 - label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;"
124 - oncommand="openFormattedURL('app.releaseNotesURL');"/>
125 <menuseparator id="functionsSeparator"/>
126 <menuitem id="featureConfigurator"
127 label="&featureConfiguratorCmd.label;"
128 --- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
129 +++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
131 # License, v. 2.0. If a copy of the MPL was not distributed with this
132 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
134 -MOZ_APP_BASENAME=Thunderbird
135 -MOZ_APP_NAME=thunderbird
136 +MOZ_APP_BASENAME=Icedove
137 +MOZ_APP_NAME=icedove
140 MOZ_CHROME_FILE_FORMAT=omni
141 --- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~ 2011-08-12 16:16:45.000000000 +0200
142 +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200
143 @@ -1324,8 +1324,7 @@
148 - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
149 + printf("%s %s", gAppData->name, gAppData->version);
150 if (gAppData->copyright)
151 printf(", %s", gAppData->copyright);