From 9cdd31dd231976c2c7166c0f08cf86eed680e6f4 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Thu, 30 Oct 2003 02:01:14 +0000
Subject: [PATCH] Bug 129104 account central for imap server should have
 subscribe option just like news patch by borggraefe@despammed.com r=timeless
 sr=bienvenu

---
 mailnews/base/resources/content/msgAccountCentral.js  | 11 ++++++++---
 mailnews/base/resources/content/msgAccountCentral.xul |  8 +++++++-
 .../base/resources/locale/en-US/msgAccountCentral.dtd |  1 +
 themes/modern/messenger/accountCentral.css            |  4 ++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/mailnews/base/resources/content/msgAccountCentral.js b/mailnews/base/resources/content/msgAccountCentral.js
index 7044dc06b46..3fd30fbcd77 100644
--- a/mailnews/base/resources/content/msgAccountCentral.js
+++ b/mailnews/base/resources/content/msgAccountCentral.js
@@ -148,11 +148,16 @@ function ArrangeAccountCentralItems(server, protocolInfo, msgFolder)
         var canHaveFilters = server.canHaveFilters;
         SetItemDisplay("CreateFilters", canHaveFilters);
 
+        // Subscribe to IMAP Folders
+        var canSubscribeImapFolders = msgFolder.canSubscribe && protocolInfo.canGetMessages;
+        SetItemDisplay("SubscribeImapFolders", canSubscribeImapFolders);
+
         // Offline Settings
         var supportsOffline = (server.offlineSupportLevel != 0);
         SetItemDisplay("OfflineSettings", supportsOffline);
             
-        var displayAdvFeatures = canSearchMessages || canHaveFilters || supportsOffline;
+        var displayAdvFeatures = canSearchMessages || canHaveFilters ||
+                                 canSubscribeImapFolders|| supportsOffline;
         // Display Adv Features header, only if any of the items are displayed
         SetItemDisplay("AdvancedFeaturesHeader", displayAdvFeatures);
     
@@ -249,7 +254,7 @@ function CreateMsgFilters()
 } 
 
 // Open Subscribe dialog
-function SubscribeNewsgroups()
+function Subscribe()
 {
     window.parent.MsgSubscribe();
 } 
@@ -258,4 +263,4 @@ function SubscribeNewsgroups()
 function JunkSettings()
 {
     window.parent.MsgJunkMail();
-} 
\ No newline at end of file
+}
diff --git a/mailnews/base/resources/content/msgAccountCentral.xul b/mailnews/base/resources/content/msgAccountCentral.xul
index da098c23a4e..02375df0f8f 100644
--- a/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mailnews/base/resources/content/msgAccountCentral.xul
@@ -92,7 +92,7 @@ Rights Reserved.
       <separator id="NewsHeader.separator" class="thin"/>
       <row id="SubscribeNewsgroups" class="acctCentralRow">
         <hbox> 
-          <label class="acctCentralText acctCentralLinkText" value="&subscribeNewsLink.label;" onclick="SubscribeNewsgroups();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&subscribeNewsLink.label;" onclick="Subscribe();"/> 
         </hbox> 
       </row>
       <separator id="SubscribeNewsgroups.separator" class="thin"/>
@@ -147,6 +147,12 @@ Rights Reserved.
           <label class="acctCentralText acctCentralLinkText" value="&filtersLink.label;" onclick="CreateMsgFilters();"/> 
         </hbox> 
       </row>
+      <separator id="SubscribeImapFolders.separator" class="thin"/>
+      <row id="SubscribeImapFolders" class="acctCentralRow">
+        <hbox> 
+          <label class="acctCentralText acctCentralLinkText" value="&subscribeImapFolders.label;" onclick="Subscribe();"/> 
+        </hbox> 
+      </row>
       <separator id="CreateFilters.separator" class="thin"/>
       <row id="OfflineSettings" class="acctCentralRow">
         <hbox> 
diff --git a/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd b/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
index e6a69dcb96b..ac636c1c71d 100644
--- a/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
+++ b/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
@@ -30,6 +30,7 @@ Contributor(s):
 <!ENTITY subscribeNewsLink.label      "Subscribe to newsgroups"> 
 
 <!ENTITY accountsSectionHdr.label     "Accounts"> 
+<!ENTITY subscribeImapFolders.label   "Subscribe to folders"> 
 <!ENTITY settingsLink.label           "View settings for this account"> 
 <!ENTITY newAcctLink.label            "Create a new account"> 
 
diff --git a/themes/modern/messenger/accountCentral.css b/themes/modern/messenger/accountCentral.css
index dc5112fbfd8..e12514d4047 100644
--- a/themes/modern/messenger/accountCentral.css
+++ b/themes/modern/messenger/accountCentral.css
@@ -113,6 +113,10 @@ separator.thin {
   list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.gif");
 }
 
+#SubscribeImapFolders {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.gif");
+}
+
 #SearchMessages {
   list-style-image: url("chrome://messenger/skin/icons/acct-search.gif");
 }