]>
Commit | Line | Data |
---|---|---|
aaf0282d | 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 | |
3 | @@ -28,7 +28,7 @@ | |
4 | <em:id>@XPI_EM_ID@</em:id> | |
7c84544b | 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> | |
11 | #endif | |
aaf0282d | 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 | |
7c84544b | 14 | @@ -39,7 +39,7 @@ |
15 | ||
16 | # addon description: | |
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 | |
21 | ||
22 | # Lightning branding | |
aaf0282d | 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 | |
33107162 | 25 | @@ -37,7 +37,7 @@ |
26 | ||
27 | #filter substitution | |
28 | [App] | |
29 | -Name=Thunderbird | |
30 | +Name=Icedove | |
31 | Version=@APP_VERSION@ | |
32 | BuildID=@GRE_BUILDID@ | |
33 | #ifdef MOZ_SOURCE_REPO | |
64b4570d JB |
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 | |
7876e8ff | 36 | @@ -74,7 +74,7 @@ |
33107162 | 37 | // App-specific update preferences |
38 | ||
39 | // Whether or not app updates are enabled | |
40 | -pref("app.update.enabled", true); | |
aaf0282d | 41 | +pref("app.update.enabled", false); |
33107162 | 42 | |
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 | |
aaf0282d | 45 | @@ -102,7 +102,7 @@ |
46 | pref("app.update.url.manual", "http://www.getthunderbird.com"); | |
33107162 | 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.mozillamessaging.com/%LOCALE%/%APP%/releases/"); | |
50 | +pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/"); | |
51 | // User-settable override to app.update.url for testing purposes. | |
52 | //pref("app.update.url.override", ""); | |
53 | ||
64b4570d | 54 | @@ -120,10 +120,10 @@ |
33107162 | 55 | pref("app.update.showInstalledUI", false); |
56 | ||
57 | // Release notes URL | |
58 | -pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); | |
59 | +pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); | |
60 | ||
61 | // Base URL for web-based support pages. | |
62 | -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); | |
63 | +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/"); | |
64 | ||
aaf0282d | 65 | // Controls enabling of the extension system logging (can reduce performance) |
66 | pref("extensions.logging.enabled", false); | |
64b4570d | 67 | @@ -145,11 +145,11 @@ |
aaf0282d | 68 | // Preferences for AMO integration |
69 | pref("extensions.getAddons.cache.enabled", true); | |
70 | pref("extensions.getAddons.maxResults", 15); | |
64b4570d JB |
71 | -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); |
72 | -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%"); | |
aaf0282d | 73 | -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); |
6864d0a2 | 74 | -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"); |
aaf0282d | 75 | -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); |
64b4570d JB |
76 | +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); |
77 | +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%"); | |
aaf0282d | 78 | +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); |
6864d0a2 | 79 | +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"); |
aaf0282d | 80 | +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); |
64b4570d | 81 | |
33107162 | 82 | // Blocklist preferences |
83 | pref("extensions.blocklist.enabled", true); | |
64b4570d | 84 | @@ -174,7 +174,7 @@ |
33107162 | 85 | pref("extensions.update.interval", 86400); // Check for updates to Extensions and |
86 | // Themes every day | |
aaf0282d | 87 | |
88 | -pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/themes/"); | |
89 | +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); | |
33107162 | 90 | pref("extensions.dss.enabled", false); // Dynamic Skin Switching |
91 | pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next | |
92 | ||
64b4570d | 93 | @@ -370,7 +370,7 @@ |
33107162 | 94 | |
33107162 | 95 | pref("spellchecker.dictionary", ""); |
96 | // Dictionary download preference | |
3ad9bb18 | 97 | -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/"); |
98 | +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/"); | |
33107162 | 99 | |
100 | // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular | |
101 | // mail application without any user intervention. Possible values are: | |
64b4570d | 102 | @@ -507,7 +507,7 @@ |
33107162 | 103 | pref("mailnews.database.global.logging.console", true); |
104 | ||
105 | // page to load to find good header add-ons | |
106 | -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%"); | |
107 | +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%"); | |
108 | ||
7876e8ff | 109 | // Serif fonts look dated. Switching those language families to sans-serif |
110 | // where we think it makes sense. Worth investigating for other font families | |
aaf0282d | 111 | --- mozilla/mail/base/content/baseMenuOverlay.xul~ 2011-08-12 15:52:04.000000000 +0200 |
112 | +++ mozilla/mail/base/content/baseMenuOverlay.xul 2011-09-17 15:29:32.946531066 +0200 | |
113 | @@ -73,9 +73,6 @@ | |
33107162 | 114 | <menuitem id="whatsNew" |
115 | label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;" | |
116 | oncommand="openWhatsNew();"/> | |
aaf0282d | 117 | - <menuitem id="releaseNotes" |
118 | - label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;" | |
119 | - oncommand="openFormattedURL('app.releaseNotesURL');"/> | |
120 | <menuseparator id="functionsSeparator"/> | |
121 | <menuitem id="featureConfigurator" | |
122 | label="&featureConfiguratorCmd.label;" | |
123 | --- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200 | |
124 | +++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200 | |
7766e26f SP |
125 | @@ -36,7 +36,7 @@ |
126 | # | |
127 | # ***** END LICENSE BLOCK ***** | |
128 | ||
129 | -MOZ_APP_NAME=thunderbird | |
130 | +MOZ_APP_NAME=icedove | |
131 | MOZ_UPDATER=1 | |
132 | MOZ_THUNDERBIRD=1 | |
aaf0282d | 133 | MOZ_CHROME_FILE_FORMAT=omni |
134 | --- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~ 2011-08-12 16:16:45.000000000 +0200 | |
135 | +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200 | |
136 | @@ -1324,8 +1324,7 @@ | |
33107162 | 137 | static inline void |
138 | DumpVersion() | |
139 | { | |
140 | - printf("%s %s %s", | |
141 | - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version); | |
142 | + printf("%s %s", gAppData->name, gAppData->version); | |
143 | if (gAppData->copyright) | |
144 | printf(", %s", gAppData->copyright); | |
145 | printf("\n"); |