From 7ab1c97829eae2cd0519633abd9c5582f57c7153 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Thu, 9 Aug 2001 03:21:32 +0000
Subject: [PATCH] fix for some minor subscribe column issues. #94259
 r/sr=bienvenu

---
 mailnews/base/resources/content/subscribe.xul | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index 600994fa18c3..2f5369aa829b 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -68,7 +68,6 @@ Rights Reserved.
               <text class="label" value="&server.label;" for="serverMenu"/>
               <menulist oncommand="onServerClick(event);" id="serverMenu"
                         datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-                        ignore="http://home.netscape.com/NC-rdf#MessageChild"
                         containment="http://home.netscape.com/NC-rdf#child"
                         ref="msgaccounts:/" flex="1">
                 <template>
@@ -116,7 +115,7 @@ Rights Reserved.
           <treecolgroup id="theSubscribeColumns">
             <treecol persist="hidden width" width="0" flex="5" id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name"/>
             <splitter class="tree-splitter"/>
-            <treecol persist="hidden" fixed="true" id="SubscribedColumn" resource="http://home.netscape.com/NC-rdf#Subscribed"/>
+            <treecol persist="hidden width" width="0" flex="1" id="SubscribedColumn" resource="http://home.netscape.com/NC-rdf#Subscribed"/>
             <splitter class="tree-splitter"/>
             <treecol persist="hidden width" width="0" flex="1" id="TotalMessagesColumn" resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
           </treecolgroup>
@@ -132,9 +131,9 @@ Rights Reserved.
      </hbox>
      <hbox id="searchview">
        <outliner id="searchOutliner" flex="1" onclick="SearchOnClick(event);"> 
-         <outlinercol id="nameCol" label="..." class="outlinercol-header outlinercol-inset-header" flex="5" width="0" persist="hidden width" />
+         <outlinercol id="nameCol" label="..." class="outlinercol-header outlinercol-inset-header" flex="5" width="0" persist="hidden width" ignoreincolumnpicker="true" />
          <splitter class="tree-splitter" />
-         <outlinercol id="subscribedCol" fixed="true" persist="hidden" class="outlinercol-header outlinercol-image outlinercol-inset-header subscribedColumnHeader" label="&subscribedHeader.label;" />
+         <outlinercol id="subscribedCol" flex="1" width="0" persist="hidden width" class="outlinercol-header outlinercol-inset-header subscribedColumnHeader" label="&subscribedHeader.label;" />
          <splitter class="tree-splitter" />
          <outlinercol id="messagesCol" label="&messagesHeader.label;" class="outlinercol-header outlinercol-inset-header" flex="1" width="0" persist="hidden width" />
          <outlinerbody id="searchOutlinerBody" flex="1" />