diff options
Diffstat (limited to 'browser/app/profile')
3 files changed, 9 insertions, 10 deletions
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in index 3e803af5b..a2cb9754d 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in @@ -11,15 +11,15 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id> - <em:version>@FIREFOX_VERSION@</em:version> + <em:version>@MOZ_APP_VERSION@</em:version> <!-- Target Application this theme can install into, with minimum and maximum supported versions. --> <em:targetApplication> <Description> - <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>@FIREFOX_VERSION@</em:minVersion> - <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion> + <em:id>@MOZ_APP_ID@</em:id> + <em:minVersion>@MOZ_APP_VERSION@</em:minVersion> + <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion> </Description> </em:targetApplication> diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build index 20a4c1cbe..f8c2a5c4b 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build @@ -4,6 +4,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] +DEFINES['MOZ_APP_ID'] = CONFIG['MOZ_APP_ID'] + FINAL_TARGET = 'dist/bin/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}' FINAL_TARGET_PP_FILES += [ 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 |