fix for bugs 38107 and 40175. review=putterman

themes/classic/messenger/folderPane.css

@@ -60,6 +60,10 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail.gif");
+}
 
 /* IMAP folders */
 
@@ -68,12 +72,22 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"
     list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+}
+
 /* Local servers */
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] 
 {
  list-style-image: url("chrome://messenger/skin/server-local.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
+{
+ list-style-image: url("chrome://messenger/skin/server-local.gif");
+}
+
 
 /* News folders */
 .tree-cell-folderpane-icon[ServerType="nntp"]
@@ -86,11 +100,20 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"
     list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+}
+
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] 
 {
     list-style-image: url("chrome://messenger/skin/server-news.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news.gif");
+}
 
 /*All Servers*/
 .tree-folder-row[IsServer="true"]

themes/classic/messenger/mac/folderPane.css

@@ -45,6 +45,11 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail.gif");
+}
+
 .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
@@ -52,7 +57,7 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
 
 treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
- list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
+ list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
 }
 
 /* differentiate new messages on inbox/folders from biff on the server */
@@ -81,12 +86,21 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image      : url("chrome://messenger/skin/server-remote-lock.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+}
+
 /* Local servers */
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] 
   {
     list-style-image      : url("chrome://messenger/skin/server-local.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
+{
+ list-style-image: url("chrome://messenger/skin/server-local.gif");
+}
 
 /* News folders */
 .tree-cell-folderpane-icon[ServerType="nntp"]
@@ -99,11 +113,20 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image      : url("chrome://messenger/skin/server-news-lock.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+}
+
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] 
   {
     list-style-image      : url("chrome://messenger/skin/server-news.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news.gif");
+}
 
 /*All Servers*/
 .tree-folder-row[IsServer="true"]

themes/classic/messenger/win/folderPane.css

@@ -45,6 +45,11 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail.gif");
+}
+
 .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
@@ -52,7 +57,7 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
 
 treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
- list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
+ list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
 }
 
 /* differentiate new messages on inbox/folders from biff on the server */
@@ -81,12 +86,22 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image      : url("chrome://messenger/skin/server-remote-lock.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+}
+
 /* Local servers */
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] 
   {
     list-style-image      : url("chrome://messenger/skin/server-local.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
+{
+ list-style-image: url("chrome://messenger/skin/server-local.gif");
+}
+
 
 /* News folders */
 .tree-cell-folderpane-icon[ServerType="nntp"]
@@ -99,11 +114,21 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image      : url("chrome://messenger/skin/server-news-lock.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+}
+
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] 
   {
     list-style-image      : url("chrome://messenger/skin/server-news.gif");
   }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news.gif");
+}
+
 
 /*All Servers*/
 .tree-folder-row[IsServer="true"]

themes/modern/messenger/folderPane.css

@@ -40,21 +40,25 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
  list-style-image: url("chrome://messenger/skin/folder-trash.gif");
 }
 
-.tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
-{
- list-style-image: url("chrome://messenger/skin/folder-new-closed.gif");
-}
-
-treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
-{
- list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
-}
-
 .tree-cell-folderpane-icon[IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail.gif");
+}
+
+.tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
+}
+
+treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
+}
 
 /* differentiate new messages on inbox/folders from biff on the server */
 .tree-cell-folderpane-icon[NewMessages="true"]
@@ -83,12 +87,22 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+}
+
 /* Local servers */
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] 
 {
  list-style-image: url("chrome://messenger/skin/server-local.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
+{
+ list-style-image: url("chrome://messenger/skin/server-local.gif");
+}
+
 
 /* News folders */
 .tree-cell-folderpane-icon[ServerType="nntp"]
@@ -101,11 +115,20 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
     list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+}
+
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] 
 {
     list-style-image: url("chrome://messenger/skin/server-news.gif");
 }
 
+treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
+{
+ list-style-image: url("chrome://messenger/skin/server-news.gif");
+}
 
 /*All Servers*/
 .tree-folder-row[IsServer="true"]