Bug 432938 - "Use GTK stock icon for netError favicon instead of Windows icon" [p=reed r+sr=jst r=dietrich a1.9=schrep]
authorreed@reedloden.com
Fri, 09 May 2008 20:36:36 -0700
changeset 15101 71647e8059279711d4ac69540667d1034fca1b9e
parent 15100 677a47fbef14410f8f7025b8d4297a89051e0196
child 15102 399bd322d907cfb303d837b5edc7901d79707c1a
push id27
push userjorendorff@mozilla.com
push dateTue, 13 May 2008 14:57:59 +0000
treeherdermozilla-central@fbb8cd8a9f55 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdietrich
bugs432938
milestone1.9pre
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
docshell/resources/content/netError.xhtml
--- 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
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -56,17 +56,21 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&loadError.label;</title>
     <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:
       //   moz-neterror:page?e=error&u=url&d=desc
       //
       // or optionally, to specify an alternate CSS class to allow for
       // custom styling and favicon:
       //