From 1fd102d3e09a0444c97355f43ecdf64a558a767c Mon Sep 17 00:00:00 2001
From: "rjc%netscape.com"
 <rjc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Sep 2006 06:01:53 +0000
Subject: [PATCH] Fix bugs 113745, 113742 and 114811:  all regarding
 "moz-icon:".  Fix up XP_MAC code to use Mac OS's Icon Services, and expose
 platform icons in file:/// display and search panel (and search preferences
 panel).  Mixture of r/srs:  sdagley, ben, and smfr

git-svn-id: svn://10.0.0.236/trunk@211017 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigator.xul        | 10 +++++++++-
 mozilla/suite/browser/navigatorOverlay.xul |  7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 2b8e285b45b..330f701474b 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -289,6 +289,8 @@ Contributor(s): ______________________________________. -->
           <rule parent="hbox" iscontainer="true" isempty="true"
                 rdf:type="http://home.netscape.com/NC-rdf#Folder">
             <toolbarbutton type="menu" editable="true" class="bookmark-item"
+                           image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                           validate="never"
                            rdf:type="http://home.netscape.com/NC-rdf#Folder"
                            uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name"
                            ondraggesture="if (!event.altKey) { event.preventBubble(); return false; }">
@@ -302,6 +304,8 @@ Contributor(s): ______________________________________. -->
             <toolbarbutton type="menu" class="bookmark-item" uri="rdf:*" editable="true"
                            rdf:type="http://home.netscape.com/NC-rdf#Folder"
                            label="rdf:http://home.netscape.com/NC-rdf#Name"
+                           image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                           validate="never"
                           ondraggesture="if (!event.altKey) { event.preventBubble(); return false; }">
               <menupopup ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"/>
             </toolbarbutton>
@@ -318,6 +322,8 @@ Contributor(s): ______________________________________. -->
           </rule>
 
           <rule iscontainer="true" isempty="true"
+                image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                validate="never"
                 rdf:type="http://home.netscape.com/NC-rdf#Folder">
             <menupopup>
               <menu class="menu-iconic bookmark-item" uri="rdf:*" 
@@ -332,7 +338,9 @@ Contributor(s): ______________________________________. -->
 
           <rule iscontainer="true">
             <menupopup>
-              <menu class="menu-iconic bookmark-item" uri="rdf:*" 
+              <menu class="menu-iconic bookmark-item" uri="rdf:*"
+                    image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                    validate="never"
                     label="rdf:http://home.netscape.com/NC-rdf#Name">
                 <menupopup/>
               </menu>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 6ea60fdeb10..dc4487adb90 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -309,6 +309,8 @@
               rdf:type="http://home.netscape.com/NC-rdf#Folder">
           <menupopup>
             <menu class="menu-iconic bookmark-item" uri="rdf:*" 
+                  src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                  validate="never"
                   type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
                   label="rdf:http://home.netscape.com/NC-rdf#Name">
               <menupopup>
@@ -319,7 +321,10 @@
         </rule>
         <rule iscontainer="true">
           <menupopup>
-            <menu class="menu-iconic bookmark-item" uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name"
+            <menu class="menu-iconic bookmark-item" uri="rdf:*"
+                  src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                  validate="never"
+            	  label="rdf:http://home.netscape.com/NC-rdf#Name"
                   type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
               <menupopup />
             </menu>