From 9898e29fb61136484d4c057f9f602e242d992b23 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 23 Mar 2005 10:51:09 +0000
Subject: [PATCH] Bug 286910 - Buttons order is wrong in preferences
 sub-dialogs (on *nix/mac). r=mconnor

git-svn-id: svn://10.0.0.236/trunk@171050 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/widgets/preferences.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mozilla/toolkit/content/widgets/preferences.xml b/mozilla/toolkit/content/widgets/preferences.xml
index c46c3ae0e3e..e12a5354c17 100644
--- a/mozilla/toolkit/content/widgets/preferences.xml
+++ b/mozilla/toolkit/content/widgets/preferences.xml
@@ -432,7 +432,16 @@
           <children includes="prefpane"/>
         </xul:deck>
       </xul:hbox>
-      <xul:hbox pack="end" anonid="dlg-buttons" class="prefWindow-dlgbuttons">
+      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
+#ifdef XP_UNIX
+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
+        <xul:spacer anonid="spacer" flex="1" hidden="true"/>
+        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+#else
         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
         <xul:spacer anonid="spacer" flex="1" hidden="true"/>
         <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
@@ -440,6 +449,7 @@
         <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+#endif
       </xul:hbox>
       <xul:hbox>
         <children/>