From 105c537181cdce73ec1938ef50bf2007e3c2ce5a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 24 Jun 2018 23:57:19 +0200
Subject: [PATCH] Make about:webrtc conditional.

This resolves #536
---
 docshell/base/nsAboutRedirector.cpp | 2 ++
 toolkit/content/jar.mn              | 2 ++
 toolkit/locales/jar.mn              | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index e56447296e..a50134cecc 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -140,10 +140,12 @@ static RedirEntry kRedirMap[] = {
   {
     "telemetry", "chrome://global/content/aboutTelemetry.xhtml",
     nsIAboutModule::ALLOW_SCRIPT
+#ifdef MOZ_WEBRTC
   },
   {
     "webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",
     nsIAboutModule::ALLOW_SCRIPT
+#endif
   }
 };
 static const int kRedirTotal = mozilla::ArrayLength(kRedirMap);
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index ca1a602a96..c8dd6dc473 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -25,9 +25,11 @@ toolkit.jar:
 #endif
    content/global/aboutServiceWorkers.js
    content/global/aboutServiceWorkers.xhtml
+#ifdef MOZ_WEBRTC
    content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)
    content/global/aboutwebrtc/aboutWebrtc.js    (aboutwebrtc/aboutWebrtc.js)
    content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html)
+#endif
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
    content/global/aboutTelemetry.js
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index abc96086f5..0b3a5dc72e 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -21,7 +21,9 @@
   locale/@AB_CD@/global/aboutSupport.properties         (%chrome/global/aboutSupport.properties)
   locale/@AB_CD@/global/aboutTelemetry.dtd              (%chrome/global/aboutTelemetry.dtd)
   locale/@AB_CD@/global/aboutTelemetry.properties       (%chrome/global/aboutTelemetry.properties)
+#ifdef MOZ_WEBRTC
   locale/@AB_CD@/global/aboutWebrtc.properties          (%chrome/global/aboutWebrtc.properties)
+#endif
   locale/@AB_CD@/global/autocomplete.properties         (%chrome/global/autocomplete.properties)
   locale/@AB_CD@/global/appPicker.dtd                   (%chrome/global/appPicker.dtd)
   locale/@AB_CD@/global/brand.dtd                       (generic/chrome/global/brand.dtd)