Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out bug 432938 because it caused bug 433241, a=schrep/beltzner

Browse Source
This commit is contained in:
gavin@gavinsharp.com 2008-05-11 13:12:29 -07:00
parent 98da79f35c
commit d62cf5b07b
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/resources/content/jar.mn
View File

@ -1,2 +1,2 @@
toolkit.jar:
* content/global/netError.xhtml
content/global/netError.xhtml

4
docshell/resources/content/netError.xhtml
View File

@ -61,11 +61,7 @@
<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:

4
toolkit/components/places/src/nsFaviconService.h
View File

@ -129,9 +129,5 @@ private:
};
#define FAVICON_DEFAULT_URL "chrome://mozapps/skin/places/defaultFavicon.png"
#ifdef MOZ_WIDGET_GTK2
#define FAVICON_ERRORPAGE_URL "moz-icon://stock/gtk-dialog-warning?size=menu"
#else
#define FAVICON_ERRORPAGE_URL "chrome://global/skin/icons/warning-16.png"
#endif
#define FAVICON_ANNOTATION_NAME "favicon"