From afe7e4929afcf4fdb6c2f39904a7e5b80fa67aa2 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Sat, 4 Dec 1999 19:52:03 +0000
Subject: [PATCH] fix copy and paste errors:  CanRename -> CanFileMessages. It
 worked, because for nntp servers, both of those are always false. fix the
 rename rules so that folders with no children that can't be renamed are show,
 but disabled.  remove the oncommand="" for menu items that are generated as
 disabled.

---
 .../content/msgFolderPickerOverlay.xul        | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mailnews/base/resources/content/msgFolderPickerOverlay.xul b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
index 21a5e22fafcb..f12f3f94c713 100644
--- a/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@@ -82,7 +82,6 @@
 	  <rule nc:CanCreateSubfolders="false" iscontainer="true" isempty="true">
             <menupopup>
                         <menuitem disabled="true" uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
-                                oncommand="PickedMsgFolder(event.target,'msgNewFolderPicker')"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
                                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -140,6 +139,17 @@
               </menu>
             </menupopup>
           </rule>
+	  <!-- this makes the special folders that you can't rename
+		like TRASH and INBOX show up, but they are disabled -->
+	  <rule nc:CanRename="false" iscontainer="true" isempty="true">
+            <menupopup>
+                        <menuitem disabled="true" uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+                                SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+                                BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+                                IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"/>
+            </menupopup>
+          </rule>
           <rule nc:CanRename="true">
             <menupopup>
                         <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
@@ -176,7 +186,7 @@
               </menu>
             </menupopup>
           </rule>
-	  <rule nc:CanRename="false" nc:ServerType="nntp">
+	  <rule nc:CanFileMessages="false" nc:ServerType="nntp">
                 <!-- don't show nntp servers in the file picker -->
           </rule>
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
@@ -226,7 +236,7 @@
               </menu>
             </menupopup>
           </rule>
-	  <rule nc:CanRename="false" nc:ServerType="nntp">
+	  <rule nc:CanFileMessages="false" nc:ServerType="nntp">
                 <!-- don't show nntp servers in the file picker -->
           </rule>
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
@@ -276,7 +286,7 @@
               </menu>
             </menupopup>
           </rule>
-	  <rule nc:CanRename="false" nc:ServerType="nntp">
+	  <rule nc:CanFileMessages="false" nc:ServerType="nntp">
                 <!-- don't show nntp servers in the file picker -->
           </rule>
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
@@ -326,7 +336,7 @@
               </menu>
             </menupopup>
           </rule>
-	  <rule nc:CanRename="false" nc:ServerType="nntp">
+	  <rule nc:CanFileMessages="false" nc:ServerType="nntp">
                 <!-- don't show nntp servers in the file picker -->
           </rule>
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">