From b991f1b4d8914455a6fac09b8ab0768cd6a64bc5 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 10 May 2008 03:36:36 +0000
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]

git-svn-id: svn://10.0.0.236/trunk@251498 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/resources/content/jar.mn         | 2 +-
 mozilla/docshell/resources/content/netError.xhtml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mozilla/docshell/resources/content/jar.mn b/mozilla/docshell/resources/content/jar.mn
index f1641c86010..2ebffb26d67 100644
--- a/mozilla/docshell/resources/content/jar.mn
+++ b/mozilla/docshell/resources/content/jar.mn
@@ -1,2 +1,2 @@
 toolkit.jar:
-	content/global/netError.xhtml
+*	content/global/netError.xhtml
diff --git a/mozilla/docshell/resources/content/netError.xhtml b/mozilla/docshell/resources/content/netError.xhtml
index 7409ed47b6a..f690e932ef8 100644
--- a/mozilla/docshell/resources/content/netError.xhtml
+++ b/mozilla/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: