From 5d0d46a6bb397736b5a430346ffd7a9ee3574df9 Mon Sep 17 00:00:00 2001
From: "gayatrib%netscape.com" <gayatrib%netscape.com>
Date: Thu, 17 Aug 2000 23:48:42 +0000
Subject: [PATCH] fix for bugs 38107 and 40175. review=putterman

---
 themes/classic/messenger/folderPane.css       |  23 ++++++++++
 themes/classic/messenger/mac/folderPane.css   |  25 +++++++++-
 themes/classic/messenger/win/folderPane.css   |  27 ++++++++++-
 themes/modern/messenger/folder-inbox-new.gif  | Bin 111 -> 114 bytes
 themes/modern/messenger/folder-new-closed.gif | Bin 103 -> 111 bytes
 themes/modern/messenger/folder-new-open.gif   | Bin 111 -> 97 bytes
 themes/modern/messenger/folderPane.css        |  43 ++++++++++++++----
 themes/modern/messenger/message-mail-new.gif  | Bin 90 -> 110 bytes
 themes/modern/messenger/message-news-new.gif  | Bin 111 -> 111 bytes
 themes/modern/messenger/server-local-new.gif  | Bin 105 -> 107 bytes
 themes/modern/messenger/server-mail-new.gif   | Bin 106 -> 108 bytes
 themes/modern/messenger/server-news-new.gif   | Bin 140 -> 113 bytes
 12 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/themes/classic/messenger/folderPane.css b/themes/classic/messenger/folderPane.css
index 1d8a5d3e620b..ea1af198f98f 100644
--- a/themes/classic/messenger/folderPane.css
+++ b/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"]
diff --git a/themes/classic/messenger/mac/folderPane.css b/themes/classic/messenger/mac/folderPane.css
index 334a9e1a0e66..63828010d13f 100644
--- a/themes/classic/messenger/mac/folderPane.css
+++ b/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"]
diff --git a/themes/classic/messenger/win/folderPane.css b/themes/classic/messenger/win/folderPane.css
index f531fb526d4b..77bd6551ee1b 100644
--- a/themes/classic/messenger/win/folderPane.css
+++ b/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"]
diff --git a/themes/modern/messenger/folder-inbox-new.gif b/themes/modern/messenger/folder-inbox-new.gif
index 3b7d8c2fb6e7ba3f4cf31da154a915ffa9a0c87b..9dcb3a0fe89e5079e2f049cb69729fa66144b33d 100644
GIT binary patch
delta 63
zcmV-F0Korma*#MWHwZ91`cSz?DuK5N(dhkFC|c4sj3f{YCXgy$5TM~)a#6mt`n7I6
V*ax<n^jxo8O~!0CFS=*~06SR$8!Z3;

delta 60
zcmV-C0K@-sZ;&`QGzhxfI*dpX!5AXnNc;TY^lYIxLV&4sK~R3~f;!D5Y&2zI_#&kb
S3(c2OIbf}%QmGp{5&%0vff@?{

diff --git a/themes/modern/messenger/folder-new-closed.gif b/themes/modern/messenger/folder-new-closed.gif
index 73e474cae9be1a5699f26d87353be17761f30534..f9fb1b126989fdd23f2a0d4ac25954cefd283b29 100644
GIT binary patch
delta 93
zcmV-j0HXhAZy!fVMmRZP5C9GUqW=KEz`&WA%rpNpGc#rYGiCq)0FfUVH#7*k+)56N
z!63O;4I$_QSSVs3sd3%{F&o!?YgEb8)WlcN4gncU6O_&3*r`CW8!~xhHWC0kAVng?

delta 85
zcmV-b0IL6QXCFsNMmRZP5C9GUqW=KEz`&WAnPz5YGyj=0Gcy1)W|1EmFDwYU+)5+H
r;6Sk@-)gb`;Pr9L1rekOKtf7#n-^x?`ifA5R=CviwIA%|NB{skyCNjj

diff --git a/themes/modern/messenger/folder-new-open.gif b/themes/modern/messenger/folder-new-open.gif
index 4929ebf984c6be946559369cc8025e23bb1f23b9..7b988104e38cd4624bc94a311931e7fcef719f85 100644
GIT binary patch
literal 97
zcmZ?wbhEHb6ky<EnE0RJz<~qC|Ba1}(-@4?6o0ZXG5~=NhyckuFd4P<XHHf+p(Lbe
xQ_*&>hM6y5+98>wuTxe{%IJE$;i)=TEc@b*pL{j$b8o8JJoAi&iwFaQH2|VhArAlm

literal 111
zcmZ?wbhEHb6ky<ESoELaz<~oZXU<GZ1EMtJ|1*t^jTwy77#J87f3h$FDFz)70aEM0
zY{IeYPS%16mWP{eWd7*+zkt0#>ab=|qFs&)PhZ5e^o({V#R)p<zN^I8KUJ^I;)-}<
KlB~kOU=0BFz$GsL

diff --git a/themes/modern/messenger/folderPane.css b/themes/modern/messenger/folderPane.css
index b5adb3ddf6ce..cb7443ea0e06 100644
--- a/themes/modern/messenger/folderPane.css
+++ b/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"]
diff --git a/themes/modern/messenger/message-mail-new.gif b/themes/modern/messenger/message-mail-new.gif
index 6268a99370841e04c81d003cf43be03848ebd0c2..78afed0eb18b411a829d5dbafa3482eeaabf535b 100644
GIT binary patch
literal 110
zcmZ?wbhEHb6ky<ESoELaz<~oZXPz<sZ)|Lw#sEYxp!k!85yaL35g@e=%*GrBHopQU
zx@Wa+=DgUn^^$ts`3;tVA~Rx2d>LdWhg2@p?0&>my?n!&J|oUg29uI~XL>O(SOWmj
CLn4d-

literal 90
zcmZ?wbhEHb6ky<EnE0RJz<~qC|Ba1}(-@4?6o0ZXG5~=NhyckuFlo2+XBI#1n<22!
q@5854F|#!_lvX(KT&v&~>N+VB^UnRGs`jkcd*<&s?<~T=U=0B1%pS1-

diff --git a/themes/modern/messenger/message-news-new.gif b/themes/modern/messenger/message-news-new.gif
index 411439f36da0fab81906914f6032efe8f79fdf91..16eae8a06bacc84e5480452b7ceefa8d6d7f976f 100644
GIT binary patch
literal 111
zcmZ?wbhEHb6ky<ESoELaz<~p4X=%p)jg5`d7=Q={6o0ZXg4jAB0;JY~*@R;=^S=**
z?$21h@*Z?O96F;hi8EJjW^2^pu8XZl)xRITo^)TN=boyhf<WL!71xdrGjgni7_0&0
C>Ld05

literal 111
zcmZ?wbhEHb6ky<ESoELaz<~p4X*1K((v1JlG(I!a*w~oCIE{gULGdRGBamXy0TCdz
z4$LMT0k{4gu#tQz6=8DNIy~-&Caal<V?^YcE56cqrs$f?n)zF-<y$A;{S(ZKBNPNx
MJWhtFFfdpH0IxPAi2wiq

diff --git a/themes/modern/messenger/server-local-new.gif b/themes/modern/messenger/server-local-new.gif
index c6e36b4753e3011570f1388107d59eba3855df31..d665fb3bf7f92c1cd41a1ec702b2ab00ad8cbbff 100644
GIT binary patch
delta 89
zcmd1ImUs7bv#?AQVBlj|^q=9tfdeyVo-zJ!Y;2sy07MK76Xhk14LCM4|NAh}Q#(|t
tyG&i7Pc`g@nB#)Y9`i){k}X*bcBJrdEn}|RwNT#6<Bv$=ad##LYXEI#A0q$&

delta 87
zcmV-d0I2_KX&*;PMmRZP5C9GUqW=KEz`$mi|1<xYGcz*)GiCrYGm#$|F)j!&+WvsZ
tN#_!n(MY1IAT?kD1AR@=Z0i?>*AToCKxR+f#b=B5Kj3L6^b{Ql06VJ!B2WMT

diff --git a/themes/modern/messenger/server-mail-new.gif b/themes/modern/messenger/server-mail-new.gif
index 4a19044476fd93438a554a17a5e20dae4fca54e3..adacfdb308ce495e9a8d9fb66cda116d2da06f45 100644
GIT binary patch
delta 84
zcmV-a0IUCMY#B#MMmRZP5C9GUqW=KEz`&WA%rpNpGc#t986Pw;2(ttJ@R3O?RU(Ua
qCm@kydC!nFp;)3HskYq+Vp|}4%eg?_Y;LL7CnzBrC9b0}0RTH{Q6VG%

delta 82
zcmV-Y0ImOQY8gjKMmRZP5C9GUqW=KEz`$mi|1<xYGcz-h86Pq)2r%0IfXGSb5|~6Q
oBivOpU;^`bik4c98dmH$1TY1V+0&_`diuWKX{hTEkBS5UJ5Hk_>Hq)$

diff --git a/themes/modern/messenger/server-news-new.gif b/themes/modern/messenger/server-news-new.gif
index 79823927785bc2c7dad0983cced0964a11138baf..060ea6f013b436af5c6f8ffd3fdca7a5cf2636be 100644
GIT binary patch
literal 113
zcmZ?wbhEHb6ky<ESoELaz<~oZXU<HUdB*s^v9WO)0}z3M;!hSv5JLw<fYdrLn{jMm
z`6n>V^KeVbi;L41PjqSYJJ!lnFtzuRSmwtb@x8NJ5>~G{cE+St-({9-%BBfLnqEfp
I`&byP0VTF4^Z)<=

delta 124
zcmXTyVKjI5bhEHb6ky<E*!-X2z<~p2&ddaYwEr{HW}Y$rKhrqvjIpsXgK-)IDwrrQ
zVasAE(4f3}uTZ9L%Qkn#pzCd+(ORv_ZVdOc5>9k4cscj@!^AgMof#gdo~Si1I=V%N
RF>d(^k!74d>l-*2tO4%JE{XsE