From 3606a19afbed7ac9d27e843f7face32f14c446f1 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 21 Jan 2010 12:48:08 -0500
Subject: [PATCH] bug 537181 - Add required prefs and set proper config options
 to support app updating r=mfinkle a=stuart

---
 mobile/app/Makefile.in |  1 +
 mobile/app/mobile.js   | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/mobile/app/Makefile.in b/mobile/app/Makefile.in
index 59793270302..0f63c12b3f7 100644
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@@ -60,6 +60,7 @@ DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
            -DAPP_VERSION=$(MOZ_APP_VERSION) \
            -DAPP_UA_NAME_EXTRA=$(MOZ_APP_UA_EXTRA) \
            -DAPP_VERSION_EXTRA=$(FIREFOX_VERSION) \
+           -DMOZ_UPDATER=$(MOZ_UPDATER) \
            $(NULL)
 
 SOURCE_STAMP := $(shell cd $(srcdir)/.. && hg identify 2>/dev/null | cut -f1 -d' ')
diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js
index bf7cd1b8248..c1d2cbc18e8 100644
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -406,3 +406,27 @@ pref("browser.search.param.yahoo-fr", "moz35");
 pref("browser.search.param.yahoo-fr-cjkt", "moz35");
 pref("browser.search.param.yahoo-fr-ja", "mozff");
 #endif
+
+/* app update prefs */
+#ifdef MOZ_UPDATER
+pref("app.update.auto", true);
+pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
+pref("app.update.timer", 600000);
+pref("app.update.mode", 1);
+pref("app.update.silent", false);
+pref("app.update.url", "https://aus2.mozilla.org/update/3/%APP_ID%/%VERSION%/%GRE_MILESTONE%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+pref("app.update.nagTimer.restart", 86400);
+pref("app.update.promptWaitTime", 43200);
+pref("app.update.idletime", 60);
+pref("app.update.showInstalledUI", false);
+pref("app.update.incompatible.mode", 0);
+
+#ifdef MOZ_OFFICIAL_BRANDING
+pref("app.update.interval", 86400);
+pref("app.update.download.backgroundInterval", 600);
+pref("app.update.url.manual", "http://www.mozilla.com/%LOCALE%/m/");
+pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/mobile/releases/");
+#else 
+pref("app.update.interval", 28800);
+#endif
+#endif