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 8150d0c381ed3f39e7e907e3d044b39c55df2dfc..abda6c4d9b6f2643e4fc8c6020e9daee9f864188 100644 (file)
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1346,7 +1346,7 @@ pref("dom.debug.propagate_gesture_events_through_content", false);
 // Geolocation preferences for the RELEASE and "later" Beta channels.
 // Some of these prefs are specified even though they are redundant; they are
 // here for clarity and end-user experiments.
-#ifndef EARLY_BETA_OR_EARLIER
+#if !defined(EARLY_BETA_OR_EARLIER) && defined(GOOGLE_API_KEY)
 pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
 
 #ifdef XP_MACOSX