From: Mike Hommey <mh@glandium.org>
Date: Sat, 1 Apr 2017 21:33:19 +0000 (+0900)
Subject: Use the Mozilla Location Service key when the Google Key is not there
X-Git-Tag: archive/raspbian/78.11.0esr-1+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0701f16e727927e66b9df5816d44acf56f5e107;p=firefox-esr.git

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 23fd5946e26..c8f57d556a6 100644
--- 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.