sync with sylpheed 0.5.3cvs9

[claws.git] / src / account.c

diff --git a/src/account.c b/src/account.c
index 94bf40ec34e0acd54b539ee14f9e5fcf518bebf3..0bf8a40ee489a2a7bf591709065acb1034e77354 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -711,18 +711,22 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                            ac_prefs->protocol == A_APOP) &&
                            ac_prefs->recv_at_getall ? "*" : "";
        text[COL_NAME] = ac_prefs->account_name;
-#if !USE_SSL
-       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3"  :
-                            ac_prefs->protocol == A_APOP  ? "APOP"  :
-                            ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
+#if USE_SSL
+       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3 ?
+                            (ac_prefs->ssl_pop ? "POP3 (SSL)" : "POP3") :
+                            ac_prefs->protocol == A_APOP ?
+                            (ac_prefs->ssl_pop ?
+                             "POP3 (APOP, SSL)" : "POP3 (APOP)") :
+                            ac_prefs->protocol == A_IMAP4 ?
+                            (ac_prefs->ssl_imap ? "IMAP4 (SSL)" : "IMAP4") :
                             ac_prefs->protocol == A_LOCAL ? "Local" :
-                            ac_prefs->protocol == A_NNTP  ? "NNTP"  :  "";
+                            ac_prefs->protocol == A_NNTP ? "NNTP"  :  "";
 #else
-       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? (!ac_prefs->ssl_pop ? "POP3" : "POP3 (SSL)") :
-                            ac_prefs->protocol == A_APOP  ? (!ac_prefs->ssl_pop ? "APOP" : "APOP (SSL)") :
-                            ac_prefs->protocol == A_IMAP4 ? (!ac_prefs->ssl_imap ? "IMAP4" : "IMAP4 (SSL)") :
+       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3" :
+                            ac_prefs->protocol == A_APOP  ? "POP3 (APOP)" :
+                            ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
                             ac_prefs->protocol == A_LOCAL ? "Local" :
-                            ac_prefs->protocol == A_NNTP  ? "NNTP"  :  "";
+                            ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
 #endif
        text[COL_SERVER] = ac_prefs->protocol == A_NNTP
                ? ac_prefs->nntp_server : ac_prefs->recv_server;