Bug 581008 - Remove support for appending arbitrary data to the User Agent string, Fennec part. r=mfinkle
authorDão Gottwald <dao@mozilla.com>
Fri, 27 Aug 2010 09:52:01 +0200
changeset 66506 f919686864566fc2093320e92074b42a08d55bdc
parent 66505 a4acd6e37bb5f50b20316f3b754476507d9c9127
child 66507 e3e522c3b1bc88567eac1a92d2e5adbfcf06289e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs581008
Bug 581008 - Remove support for appending arbitrary data to the User Agent string, Fennec part. r=mfinkle
mobile/app/Makefile.in
mobile/app/mobile.js
mobile/branding/nightly/configure.sh
mobile/branding/official/configure.sh
mobile/confvars.sh
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@@ -103,18 +103,16 @@ APP_BUILDID = $(shell $(PYTHON) $(topsrc
 APP_ICON = mobile
 APP_SPLASH = splash
 
 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
            -DGRE_BUILDID=$(GRE_BUILDID) \
            -DAPP_BUILDID=$(APP_BUILDID) \
            -DAPP_NAME=$(MOZ_APP_NAME) \
            -DAPP_VERSION=$(MOZ_APP_VERSION) \
-           -DAPP_UA_NAME_EXTRA=$(MOZ_APP_UA_EXTRA) \
-           -DAPP_VERSION_EXTRA=$(FIREFOX_VERSION) \
            -DMOZ_UPDATER=$(MOZ_UPDATER) \
            $(NULL)
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL
 endif
 
 SOURCE_STAMP := $(shell cd $(srcdir)/.. && hg identify 2>/dev/null | cut -f1 -d' ')
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -32,17 +32,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #filter substitution
 
 pref("toolkit.defaultChromeURI", "chrome://browser/content/browser.xul");
-pref("general.useragent.extra.mobile", "@APP_UA_NAME_EXTRA@/@APP_VERSION_EXTRA@ Fennec/@APP_VERSION@");
+pref("general.useragent.compatMode.firefox", true);
 pref("browser.chromeURL", "chrome://browser/content/");
 
 pref("browser.tabs.warnOnClose", true);
 #ifdef MOZ_IPC
 pref("browser.tabs.remote", true);
 #else
 pref("browser.tabs.remote", false);
 #endif
--- a/mobile/branding/nightly/configure.sh
+++ b/mobile/branding/nightly/configure.sh
@@ -1,2 +1,1 @@
 MOZ_APP_DISPLAYNAME=Fennec
-MOZ_APP_UA_EXTRA=Namoroka
--- a/mobile/branding/official/configure.sh
+++ b/mobile/branding/official/configure.sh
@@ -1,2 +1,1 @@
 MOZ_APP_DISPLAYNAME=Firefox
-MOZ_APP_UA_EXTRA=Firefox
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -31,16 +31,17 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=fennec
+MOZ_APP_UA_NAME=Fennec
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
 
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 case "$target" in
 *-wince*)
     . ${srcdir}/${MOZ_BUILD_APP}/winmo-version.txt