[tor-commits] [tor-browser/tor-browser-17.0.5esr-1] squash! Tor Browser's Firefox preference overrides.

[mikeperry@xxxxxxxxxxxxxx]

commit d53fa8ae3f267cfbb392bfa3fa1a4d463da52033
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Tue May 7 10:58:23 2013 -0700

    squash! Tor Browser's Firefox preference overrides.
---
 browser/app/Makefile.in               |    2 +-
 browser/app/profile/tor-browser.js    |    2 +-
 browser/installer/package-manifest.in |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 637ff49..bcd2d20 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -17,8 +17,8 @@ DEFINES += -DENABLE_MARIONETTE=1
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
-				$(srcdir)/profile/tor-browser.js \
 		  $(NULL)
+PREF_JS_EXPORTS += $(srcdir)/profile/tor-browser.js
 
 
 # hardcode en-US for the moment
diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js
index 8a82e4c..e9fb724 100644
--- a/browser/app/profile/tor-browser.js
+++ b/browser/app/profile/tor-browser.js
@@ -50,7 +50,7 @@ pref("gfx.downloadable_fonts.fallback_delay", -1);
 pref("general.appname.override", "Netscape");
 pref("general.appversion.override", "5.0 (Windows)");
 pref("general.buildID.override", "0");
-pref("general.useragent.locale", "SHPONKA");
+//pref("general.useragent.locale", "SHPONKA"); // Set by Torbutton
 pref("general.oscpu.override", "Windows NT 6.1");
 pref("general.platform.override", "Win32");
 pref("general.productSub.override", "20100101");
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 391e093..3b3a249 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -570,6 +570,7 @@
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 #endif
 @BINPATH@/defaults/profile/prefs.js
+@BINPATH@/@PREF_DIR@/tor-browser.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits