summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-06 11:52:41 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-06 11:52:41 +0100
commit93705a7d00b2b09ee9b5d036b71c5be79b8d10a1 (patch)
tree999025961f51886607d980ac78a7c9dcaf09c575
parentb07aad35366437cb2e07d9e75c6baf42b4ae17a4 (diff)
downloadUXP-93705a7d00b2b09ee9b5d036b71c5be79b8d10a1.tar
UXP-93705a7d00b2b09ee9b5d036b71c5be79b8d10a1.tar.gz
UXP-93705a7d00b2b09ee9b5d036b71c5be79b8d10a1.tar.lz
UXP-93705a7d00b2b09ee9b5d036b71c5be79b8d10a1.tar.xz
UXP-93705a7d00b2b09ee9b5d036b71c5be79b8d10a1.zip
Stop feeding a Firefox compat mode to AMO.
Since AMO has removed all "legacy" extensions, they do not offer anything compatible with us any longer. We send the native UA to them from now on to always have it respond with "Only with Firefox".
-rw-r--r--application/palemoon/app/profile/palemoon.js13
-rw-r--r--application/palemoon/branding/shared/pref/uaoverrides.inc5
2 files changed, 5 insertions, 13 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 69f8f6651..907ac1fbf 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -1152,19 +1152,6 @@ pref("toolkit.pageThumbs.minHeight", 180);
pref("ui.key.menuAccessKeyFocuses", true);
#endif
-// ****************** domain-specific UAs ******************
-
-// AMO needs "Firefox", obviously - pass on the OS (determined at build time)
-#ifdef XP_UNIX
-#ifdef XP_MACOSX
-pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:27.0) Gecko/20100101 Firefox/27.0");
-#else
-pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Linux; X11; rv:27.0) Gecko/20100101 Firefox/27.0");
-#endif
-#else
-pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0");
-#endif
-
// ****************** s4e prefs ******************
pref("status4evar.addonbar.borderStyle", false);
pref("status4evar.addonbar.closeButton", false);
diff --git a/application/palemoon/branding/shared/pref/uaoverrides.inc b/application/palemoon/branding/shared/pref/uaoverrides.inc
index e5e727ee5..b33758ea9 100644
--- a/application/palemoon/branding/shared/pref/uaoverrides.inc
+++ b/application/palemoon/branding/shared/pref/uaoverrides.inc
@@ -21,6 +21,11 @@
#define OS_SLICE Windows NT 6.1; WOW64;
#endif
+// Special-case AMO
+// We send the native UA slice now, since they no longer offer any compatible extensions for us.
+// This will result in an "only with Firefox" message which suits us fine, because it's the truth.
+pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+
// Required for domains that have proven unresponsive to requests from users
pref("@GUAO_PREF@.live.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");