Bug 925467: Revert push to wrong patch. 418d0fbd33b0. r=me
authorMarina Samuel <msamuel@mozilla.com>
Mon, 21 Oct 2013 13:11:32 -0400
changeset 151544 40f8ff3f63b96f0fd60b571c4c559246809a47d8
parent 151543 418d0fbd33b055d86cb7907142b8945118c217b2
child 151545 6567ee93f799dd85abfda328a3e9aa6b2c909d3a
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersme
bugs925467
milestone27.0a1
Bug 925467: Revert push to wrong patch. 418d0fbd33b0. r=me
browser/metro/Makefile.in
browser/metro/metroapp.ini.in
--- a/browser/metro/Makefile.in
+++ b/browser/metro/Makefile.in
@@ -8,17 +8,17 @@ include $(topsrcdir)/config/rules.mk
 # application.ini
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL
 endif
 
 GRE_MILESTONE := $(shell tail -n 1 $(topsrcdir)/config/milestone.txt 2>/dev/null || tail -1 $(topsrcdir)/config/milestone.txt)
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
-DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME)
+DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
 
 # 'application.ini' breaks firefox build config. So we use something different.
 metroapp.ini: metroapp.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
 	$(RM) "metroapp.ini"
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
 
 libs:: metroapp.ini
 	$(INSTALL) metroapp.ini $(FINAL_TARGET)
--- a/browser/metro/metroapp.ini.in
+++ b/browser/metro/metroapp.ini.in
@@ -1,12 +1,12 @@
 #filter substitution
 [App]
 Vendor=Mozilla
-Name=@MOZ_APP_BASENAME@
+Name=MetroFirefox
 UAName=Firefox
 Version=@GRE_MILESTONE@
 BuildID=@GRE_BUILDID@
 ID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@