Back out bug 432938 because it caused bug 433241, a=schrep/beltzner
authorgavin@gavinsharp.com
Sun, 11 May 2008 13:12:29 -0700
changeset 15109 be617a342bdf574a8870dcb776dc0f10417ce3e5
parent 15108 cb0bcaf2770b9941b6cb92527a7c513de5091bc1
child 15110 1b1e722d339e6c154f4d919f365d33ce1bc5665f
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)
reviewersschrep, beltzner
bugs432938, 433241
milestone1.9pre
Back out bug 432938 because it caused bug 433241, a=schrep/beltzner
docshell/resources/content/jar.mn
docshell/resources/content/netError.xhtml
toolkit/components/places/src/nsFaviconService.h
--- 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,21 +56,17 @@
    - ***** 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:
       //
--- a/toolkit/components/places/src/nsFaviconService.h
+++ b/toolkit/components/places/src/nsFaviconService.h
@@ -124,14 +124,10 @@ private:
 
   nsresult UpdateBookmarkRedirectFavicon(nsIURI* aPage, nsIURI* aFavicon);
   void SendFaviconNotifications(nsIURI* aPage, nsIURI* aFaviconURI);
 
   friend class FaviconLoadListener;
 };
 
 #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"