From 3e25705c51fceb505dbd43e88bb765dcc24e8f51 Mon Sep 17 00:00:00 2001
From: "stephend%netscape.com" <stephend%netscape.com>
Date: Thu, 5 Sep 2002 00:56:37 +0000
Subject: [PATCH] Bug 166690.  Remove Messages column in Subscribe for News. 
 r=varga@netscape.com, sr=sspitzer@netscape.com.  UI approval by
 jglick@netscape.com.  a=asa@mozilla.org

---
 mailnews/base/resources/content/subscribe.xul      | 9 ++++++---
 mailnews/base/resources/locale/en-US/subscribe.dtd | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index 5564b06176f4..a1dba8b8532f 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -126,7 +126,8 @@ Rights Reserved.
                     <treerow>
                       <treecell label="?LeafName" properties="ServerType-?ServerType"/>
                       <treecell properties="Subscribed-?Subscribed"/>
-                      <treecell label="?TotalMessages"/>
+                      <!-- commenting out until bug 38906 is fixed 
+                      <treecell label="?TotalMessages"/> -->
                     </treerow>
                   </treeitem>
                 </treechildren>
@@ -140,9 +141,10 @@ Rights Reserved.
             <splitter class="tree-splitter"/>
             <treecol id="subscribedColumn" persist="hidden" label="&subscribedHeader.label;"
                      sort="?Subscribed"/>
+            <!-- commenting out until bug 38906 is fixed 
             <splitter class="tree-splitter"/>
             <treecol id="messagesColumn" persist="hidden" label="&messagesHeader.label;"
-                     sort="?TotalMessages"/>
+                     sort="?TotalMessages"/> -->
           </treecols>
         </tree>
      </hbox>
@@ -155,8 +157,9 @@ Rights Reserved.
            <treecol id="nameColumn2" persist="hidden" flex="1" primary="true" label="..." />
            <splitter class="tree-splitter"/>
            <treecol id="subscribedColumn2" persist="hidden" label="&subscribedHeader.label;" />
+           <!-- commenting out until bug 38906 is fixed 
            <splitter class="tree-splitter"/>
-           <treecol id="messagesColumn2" persist="hidden" label="&messagesHeader.label;" />
+           <treecol id="messagesColumn2" persist="hidden" label="&messagesHeader.label;" /> -->
          </treecols>
          <treechildren id="searchTreeBody"/>
        </tree>
diff --git a/mailnews/base/resources/locale/en-US/subscribe.dtd b/mailnews/base/resources/locale/en-US/subscribe.dtd
index 4f93d0eeaf18..7fa5cce9daf4 100644
--- a/mailnews/base/resources/locale/en-US/subscribe.dtd
+++ b/mailnews/base/resources/locale/en-US/subscribe.dtd
@@ -30,6 +30,7 @@ Rights Reserved.
 <!ENTITY server.label                 "Account:">
 <!ENTITY server.accesskey             "A">
 <!ENTITY subscribedHeader.label       "Subscribe">
-<!ENTITY messagesHeader.label         "Messages">
+<!-- commenting out until bug 38906 is fixed 
+<!ENTITY messagesHeader.label         "Messages"> -->
 <!ENTITY namefield.label              "Show items that contain:">
 <!ENTITY namefield.accesskey          "O">