Back out bug 588874 for causing bug 600984. a=clegnitto GECKO19211_20100930_RELBRANCH FIREFOX_3_6_11_BUILD2
authorDan Witte <dwitte@mozilla.com>
Thu, 30 Sep 2010 15:50:36 -0700
branchGECKO19211_20100930_RELBRANCH
changeset 34656 053f07027a388956453f296f40ae44e9656637a7
parent 34653 f8a11a197a827307360b52bdb0833968a166c751
child 34657 8bfd8801b14509c0a632fa85b6810bba8a590667
child 34660 f5e9537ed7c012b4d5d80ba97eeaafcfbb2a30ba
push id1617
push userdwitte@mozilla.com
push dateThu, 30 Sep 2010 22:50:41 +0000
reviewersclegnitto
bugs588874, 600984
milestone1.9.2.11
Back out bug 588874 for causing bug 600984. a=clegnitto
browser/app/Makefile.in
browser/branding/nightly/configure.sh
browser/branding/unofficial/configure.sh
config/autoconf.mk.in
configure.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -58,21 +58,17 @@ AB_CD = en-US
 DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DDLL_PREFIX=$(DLL_PREFIX) \
   -DDLL_SUFFIX=$(DLL_SUFFIX) \
   $(NULL)
 
 APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
 DEFINES += -DAPP_VERSION="$(APP_VERSION)"
-ifndef MOZ_APP_UANAME
-# Unless MOZ_APP_UANAME has been explicitly set, just use the display name.
-MOZ_APP_UANAME = MOZ_APP_DISPLAYNAME
-endif
-APP_UA_NAME = $(shell echo $(MOZ_APP_UANAME) | sed -e's/[^A-Za-z]//g')
+APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g')
 DEFINES += -DAPP_UA_NAME="$(APP_UA_NAME)"
 
 DIST_FILES = application.ini
 
 GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
--- a/browser/branding/nightly/configure.sh
+++ b/browser/branding/nightly/configure.sh
@@ -1,2 +1,1 @@
 MOZ_APP_DISPLAYNAME=Minefield
-MOZ_APP_UANAME=Firefox
--- a/browser/branding/unofficial/configure.sh
+++ b/browser/branding/unofficial/configure.sh
@@ -1,2 +1,1 @@
-MOZ_APP_DISPLAYNAME=Namoroka
-MOZ_APP_UANAME=Firefox
+MOZ_APP_DISPLAYNAME="Namoroka"
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -45,17 +45,16 @@ target          = @target@
 ac_configure_args = @ac_configure_args@
 BUILD_MODULES	= @BUILD_MODULES@
 MOZILLA_VERSION = @MOZILLA_VERSION@
 FIREFOX_VERSION	= @FIREFOX_VERSION@
 
 MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
-MOZ_APP_UANAME = @MOZ_APP_UANAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
 MOZ_APP_UA_EXTRA = @MOZ_APP_UA_EXTRA@
 
 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
--- a/configure.in
+++ b/configure.in
@@ -8280,17 +8280,16 @@ AC_SUBST(MOZ_OS2_USE_DECLSPEC)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(OGLES_SDK_DIR)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
-AC_SUBST(MOZ_APP_UANAME)
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(MOZ_APP_UA_EXTRA)
 AC_SUBST(FIREFOX_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)