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 44d66e65ce31c1200f178c49c7a9bf40d99e1294..8fe0e0256b77ba711ec3e8dbc7c003fa94ff0da3 100644 (file)
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3949,7 +3949,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.