From 7fb19b8ba6f1a7049653fca3ad86c52c05c33324 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Fri, 9 May 2008 20:36:36 -0700
Subject: [PATCH] Bug 432938 - "Use GTK stock icon for netError favicon instead
 of Windows icon" [p=reed r+sr=jst r=dietrich a1.9=schrep]

---
 docshell/resources/content/jar.mn         | 2 +-
 docshell/resources/content/netError.xhtml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docshell/resources/content/jar.mn b/docshell/resources/content/jar.mn
index f1641c860108..2ebffb26d675 100644
--- a/docshell/resources/content/jar.mn
+++ b/docshell/resources/content/jar.mn
@@ -1,2 +1,2 @@
 toolkit.jar:
-	content/global/netError.xhtml
+*	content/global/netError.xhtml
diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml
index 7409ed47b6aa..f690e932ef8b 100644
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -61,7 +61,11 @@
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
+#ifdef MOZ_WIDGET_GTK2
+    <link rel="icon" type="image/png" id="favicon" href="moz-icon://stock/gtk-dialog-warning?size=menu"/>
+#else
     <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
+#endif
 
     <script type="application/x-javascript"><![CDATA[
       // Error url MUST be formatted like this: