# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1382179311 -32400
# Branch GECKO2460_2014060612_RELBRANCH
# Node ID 8d20ccd285ce866ac7a3a9b32723dc90ce858370
# Parent  c9c286a65d6b9bd841b9756763cc89812a62e371
trying to re-enable updater (with v24 fix)

diff --git a/mail/base/jar.mn b/mail/base/jar.mn
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -107,18 +107,21 @@
     content/messenger/safeMode.js                   (content/safeMode.js)
     content/messenger/sanitize.xul                  (content/sanitize.xul)
     content/messenger/sanitize.js                   (content/sanitize.js)
     content/messenger/sanitizeDialog.css            (content/sanitizeDialog.css)
     content/messenger/sanitizeDialog.js             (content/sanitizeDialog.js)
 # the following files are mail-specific overrides
 *+  content/messenger/license.html                  (/mozilla/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://messenger/content/license.html
+    content/messenger/updatesOverlay.xul             (content/updatesOverlay.xul)
+*   content/messenger/updatesOverlay.js              (content/updatesOverlay.js)
 
 comm.jar:
 % content communicator %content/communicator/
    content/communicator/contentAreaClick.js         (content/contentAreaClick.js)
 *  content/communicator/utilityOverlay.xul          (content/utilityOverlay.xul)
    content/communicator/utilityOverlay.js           (content/utilityOverlay.js)
 
 toolkit.jar:
 % overlay chrome://global/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
 % overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul
+% overlay chrome://mozapps/content/update/updates.xul chrome://messenger/content/updatesOverlay.xul
diff --git a/mail/branding/aurora/Makefile.in b/mail/branding/aurora/Makefile.in
--- a/mail/branding/aurora/Makefile.in
+++ b/mail/branding/aurora/Makefile.in
@@ -8,16 +8,18 @@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
 
+DEFINES += -DAPP_VERSION="$(MOZ_APP_VERSION)"
+
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
 	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
 	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
diff --git a/mail/branding/aurora/thunderbird-branding.js b/mail/branding/aurora/thunderbird-branding.js
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -1,12 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
+#filter substitution
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
@@ -15,8 +16,23 @@
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
 // Give the user x seconds to react before showing the big UI. default=24 hours
 pref("app.update.promptWaitTime", 86400);
 
 pref("app.vendorURL", "http://tenfourbird.sourceforge.jp/");
+
+// Tenfourbird specific prefs
+pref("distribution.id", "Tenfourbird@TENFOURBIRD_TUNED@");
+pref("distribution.version", "@APP_VERSION@");
+pref("distribution.about", "for PowerPC @TENFOURBIRD_TUNED@");
+
+#pref("app.releaseNotesURL", );
+#pref("app.support.baseURL", );
+#pref("app.update.url.details", );
+pref("app.update.url.manual", "http://en.sourceforge.jp/projects/tenfourbird/releases/");
+pref("app.update.url.override","http://tenfourbird.sourceforge.jp/update/1/check.php?name=%DISTRIBUTION%&version=%DISTRIBUTION_VERSION%");
+
+# pref("mail.instrumentation.postUrl", );
+
+pref("tenfourbird.update.url.download", "http://tenfourbird.sourceforge.jp/update/1/download.php?name=%DISTRIBUTION%&version=%DISTRIBUTION_VERSION%");
\ No newline at end of file
