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/60.5.1esr-1+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7bde8e035e0f5d83b56adb180c8e672edb5e07c9;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/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 8150d0c381e..abda6c4d9b6 100644
--- 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