From eba97e77f83054ac62335f2e59ee467deb5b9dfd Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk"
 <bugzilla%standard8.demon.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 5 May 2006 14:00:37 +0000
Subject: [PATCH] Bug 282182 sync xpfe general.xml with toolkit general.xml
 (Av3-XPFE) <general.xml>. p=Serge GAUTHERIE
 <gautheri@noos.fr>,r/sr=Neil,a=Neil for SeaMonkey-only checkin to branch.

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@196022 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/bindings/general.xml    | 22 +++++++++++--------
 mozilla/xpfe/global/resources/content/xul.css |  4 ++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/mozilla/xpfe/global/resources/content/bindings/general.xml b/mozilla/xpfe/global/resources/content/bindings/general.xml
index 35b67318dd8..b5e17d0396e 100644
--- a/mozilla/xpfe/global/resources/content/bindings/general.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/general.xml
@@ -4,7 +4,7 @@
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
-  
+
   <binding id="basecontrol">
     <implementation implements="nsIDOMXULControlElement">
       <!-- public implementation -->
@@ -46,7 +46,7 @@
           ]]>
         </setter>
       </property>
-      
+
       <field name="labelElement"/>
     </implementation>      
   </binding>
@@ -58,7 +58,6 @@
     </implementation>
   </binding>
 
-  
   <!--
     Inline Editable UI Element
     - This binding forms the basis of the inline edit treecell and the inline edit
@@ -175,7 +174,7 @@
             var rootContent = this;
             while (rootContent && rootContent.localName != rootLocalName) 
               rootContent = rootContent.parentNode;
-            
+
             if (rootContent) {
               var ctr = document.getAnonymousElementByAttribute(rootContent, "ileattr", "text-container");
               if (!rootContent.valueIsRejected) {
@@ -247,6 +246,14 @@
     </implementation>
   </binding>
 
+  <binding id="statusbarpanel-menu-iconic" display="xul:menu"
+           extends="chrome://global/content/bindings/general.xml#statusbarpanel">
+    <content>
+      <xul:image class="statusbarpanel-icon" xbl:inherits="src"/>
+      <children/>
+    </content>
+  </binding>
+
   <binding id="statusbar">
     <content>
       <children/>
@@ -283,14 +290,13 @@
         </getter>
       </property>
     </implementation>
-
   </binding>
 
-  <binding id="statusbarpanel-menu-iconic" display="xul:menu"
+  <binding id="statusbarpanel-iconic-text" display="xul:button"
            extends="chrome://global/content/bindings/general.xml#statusbarpanel">
     <content>
       <xul:image class="statusbarpanel-icon" xbl:inherits="src"/>
-      <children/>
+      <xul:label class="statusbarpanel-text" xbl:inherits="value=label,crop"/>
     </content>
   </binding>
 
@@ -327,7 +333,6 @@
         </setter>
       </property>
 
-
       <property name="selectedPanel">
         <getter>
           <![CDATA[
@@ -366,4 +371,3 @@
   </binding>
 
 </bindings>
-
diff --git a/mozilla/xpfe/global/resources/content/xul.css b/mozilla/xpfe/global/resources/content/xul.css
index b81706d27a1..1babdb2fb30 100644
--- a/mozilla/xpfe/global/resources/content/xul.css
+++ b/mozilla/xpfe/global/resources/content/xul.css
@@ -779,6 +779,10 @@ statusbarpanel {
   -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel-iconic");
 }
 
+.statusbarpanel-iconic-text {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel-iconic-text");
+}
+
 .statusbarpanel-menu-iconic {
   -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel-menu-iconic");
 }