icedove-branding.patch

   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>
   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
  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
  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
  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
  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
  34 --- mozilla/mail/app/profile/all-thunderbird.js~        2011-08-12 15:52:04.000000000 +0200
  35 +++ mozilla/mail/app/profile/all-thunderbird.js 2011-09-17 15:28:09.543206613 +0200
  36 @@ -74,7 +74,7 @@
  37  // App-specific update preferences
  38
  39  // Whether or not app updates are enabled
  40 -pref("app.update.enabled", true);
  41 +pref("app.update.enabled", false);
  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
  45 @@ -102,7 +102,7 @@
  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.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
  54 @@ -125,10 +125,10 @@
  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
  65  // Controls enabling of the extension system logging (can reduce performance)
  66  pref("extensions.logging.enabled", false);
  67 @@ -138,10 +138,10 @@
  68  // Preferences for AMO integration
  69  pref("extensions.getAddons.cache.enabled", true);
  70  pref("extensions.getAddons.maxResults", 15);
  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%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
  72 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
  73 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
  74 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
  75 +pref("extensions.getAddons.get.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%");
  76 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
  77 +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
  78 +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
  79
  80  // Blocklist preferences
  81  pref("extensions.blocklist.enabled", true);
  82 @@ -165,7 +165,7 @@
  83  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
  84                                              // Themes every day
  85
  86 -pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/themes/");
  87 +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
  88  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
  89  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
  90
  91 @@ -352,7 +352,7 @@
  92
  93  pref("spellchecker.dictionary", "");
  94  // Dictionary download preference
  95 -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
  96 +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
  97
  98  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
  99  // mail application without any user intervention. Possible values are:
 100 @@ -489,7 +489,7 @@
 101  pref("mailnews.database.global.logging.console", true);
 102
 103  // page to load to find good header add-ons
 104 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 105 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 106
 107  // Serif fonts look dated.  Switching those language families to sans-serif
 108  // where we think it makes sense.  Worth investigating for other font families
 109 --- mozilla/mail/base/content/baseMenuOverlay.xul~      2011-08-12 15:52:04.000000000 +0200
 110 +++ mozilla/mail/base/content/baseMenuOverlay.xul       2011-09-17 15:29:32.946531066 +0200
 111 @@ -73,9 +73,6 @@
 112        <menuitem id="whatsNew"
 113                  label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
 114                  oncommand="openWhatsNew();"/>
 115 -      <menuitem id="releaseNotes"
 116 -                label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;"
 117 -                oncommand="openFormattedURL('app.releaseNotesURL');"/>
 118        <menuseparator id="functionsSeparator"/>
 119        <menuitem id="featureConfigurator"
 120                  label="&featureConfiguratorCmd.label;"
 121 --- mozilla/mail/confvars.sh~   2011-08-12 15:52:05.000000000 +0200
 122 +++ mozilla/mail/confvars.sh    2011-09-17 15:34:33.613167078 +0200
 123 @@ -36,7 +36,7 @@
 124  #
 125  # ***** END LICENSE BLOCK *****
 126
 127 -MOZ_APP_NAME=thunderbird
 128 +MOZ_APP_NAME=icedove
 129  MOZ_UPDATER=1
 130  MOZ_THUNDERBIRD=1
 131  MOZ_CHROME_FILE_FORMAT=omni
 132 --- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~        2011-08-12 16:16:45.000000000 +0200
 133 +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200
 134 @@ -1324,8 +1324,7 @@
 135  static inline void
 136  DumpVersion()
 137  {
 138 -  printf("%s %s %s",
 139 -         gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
 140 +  printf("%s %s", gAppData->name, gAppData->version);
 141    if (gAppData->copyright)
 142        printf(", %s", gAppData->copyright);
 143    printf("\n");