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/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ae30772f376d9ccc9249184a7e68dac920ff2c74..7ed7f435f591d24bbc94e57e1cb94a9cdd14ac3b 100644 (file)
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1342,7 +1342,7 @@ pref("dom.debug.propagate_gesture_events_through_content", 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.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
 #else
 // Use MLS on Nightly and early Beta.