From e708512bc73c0cdb09394848289b2d51d73cc1a2 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 23 Oct 2004 04:35:58 +0000
Subject: [PATCH] Bug #261199 --> port aviary branch fix for Thunderbird:

1) Folders are now sorted properly in the virtual folder picker dialog
2) The account picker in the folder picker dialog now shows the account names
in the drop down instead of using a height of 0 pixels for each row in the menu
list.


git-svn-id: svn://10.0.0.236/trunk@164235 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/virtualFolderListDialog.xul  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/virtualFolderListDialog.xul b/mozilla/mailnews/base/resources/content/virtualFolderListDialog.xul
index a35c0b903df..63762611ece 100644
--- a/mozilla/mailnews/base/resources/content/virtualFolderListDialog.xul
+++ b/mozilla/mailnews/base/resources/content/virtualFolderListDialog.xul
@@ -40,6 +40,7 @@
 
 <dialog id="searchFolderWindow"
         xmlns:NC="http://home.netscape.com/NC-rdf#" 
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&virtualFolderListTitle.title;"
         style="width: 27em; height: 25em;"
@@ -55,13 +56,15 @@
   <hbox pack="end" align="center">
     <label value="&server.label;" accesskey="&server.accesskey;" control="serverMenu"/>
     <menulist oncommand="onServerClick(event);" id="serverMenu" 
-              datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+              datasources="rdf:msgaccountmanager"
               sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
               sortDirection="ascending" ref="msgaccounts:/" flex="1">
       <template>
-        <rule NC:CanSearchMessages="true">
+        <rule>
           <menupopup>
-            <menuitem class="menuitem-iconic" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name" ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType" IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"/>
+            <menuitem uri="..." value="..." 
+              class="menuitem-iconic"
+              label="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </menupopup>
         </rule>
       </template>
@@ -76,9 +79,8 @@
           hidecolumnpicker="true"
           seltype="multiple"
           disableKeyNavigation="true"
-          datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+          datasources="rdf:mailnewsfolders"
           flags="dont-build-content"
-          ref="msgaccounts:/"
           onkeypress="onSelectFolderTreeKeyPress(event);"
           onclick="selectFolderTreeOnClick(event);"> 
       <template>
@@ -123,7 +125,7 @@
       </template>
 
       <treecols>
-        <treecol id="folderNameCol" sort="?folderTreeNameSort" sortactive="true" 
+        <treecol id="folderNameCol"  sort="?folderTreeNameSort" sortActive="true" sortDirection="ascending"
                  flex="10" primary="true" hideheader="true" crop="center"/>
         <splitter class="tree-splitter"/>
         <treecol id="selectedColumn" hideheader="true" flex="1"/>