Use the Mozilla Location Service key when the Google Key is not there

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Use-the-Mozilla-Location-Service-key-when-the-Google.patch

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 23fd5946e26bc187faa0d8d8b7b480e8862a9672..c8f57d556a6ecbeb7d10498812fde3703909d182 100644 (file)
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3948,7 +3948,7 @@ pref("network.psl.onUpdate_notify", false);
 
 // All the Geolocation preferences are here.
 //
-#ifndef EARLY_BETA_OR_EARLIER
+#if !defined(EARLY_BETA_OR_EARLIER) && defined(GOOGLE_LOCATION_SERVICE_API_KEY)
   pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
 #else
   // Use MLS on Nightly and early Beta.