summaryrefslogtreecommitdiffstats
path: root/browser/app/profile
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-02 20:44:40 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-02 20:44:40 +0100
commit4bf1a2a1cb61a165c0540208098070222eafdfff (patch)
tree41e81fdf433c32c263cb2fad07f87812e30c747a /browser/app/profile
parentc0c702a5e3284e843e680064b4c6a7280242c567 (diff)
parentb80de6fe930792c94c9e64dd3867ffb1d663f16f (diff)
downloadUXP-4bf1a2a1cb61a165c0540208098070222eafdfff.tar
UXP-4bf1a2a1cb61a165c0540208098070222eafdfff.tar.gz
UXP-4bf1a2a1cb61a165c0540208098070222eafdfff.tar.lz
UXP-4bf1a2a1cb61a165c0540208098070222eafdfff.tar.xz
UXP-4bf1a2a1cb61a165c0540208098070222eafdfff.zip
Merge branch 'ported-moebius'
Diffstat (limited to 'browser/app/profile')
-rw-r--r--browser/app/profile/firefox.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 82f8e45a5..465b5349f 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -40,7 +40,7 @@ pref("extensions.checkCompatibility.temporaryThemeOverride_minAppVersion", "29.0
pref("xpinstall.customConfirmationUI", true);
// Preferences for AMO integration
-pref("extensions.getAddons.cache.enabled", true);
+pref("extensions.getAddons.cache.enabled", false);
pref("extensions.getAddons.maxResults", 15);
pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
@@ -1249,11 +1249,7 @@ pref("plain_text.wrap_long_lines", true);
pref("dom.debug.propagate_gesture_events_through_content", false);
// The request URL of the GeoLocation backend.
-#ifdef RELEASE_OR_BETA
-pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
-#else
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-#endif
+pref("geo.wifi.uri", "http://ip-api.com/json/?fields=lat,lon,status,message");
#ifdef XP_MACOSX
#ifdef RELEASE_OR_BETA