2004-11-12 [paul] 0.9.12cvs146.1

[claws.git] / src / account.c

diff --git a/src/account.c b/src/account.c
index 3c2b284e4958fcec25550956d9164ac0b7ec90de..b298a5278858fe06f0287ea2660124051c634e08 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -1002,9 +1002,8 @@ static void account_selected(GtkCList *clist, gint row, gint column,
                PrefsAccount *ac;
 
                ac = gtk_clist_get_row_data(clist, row);
-               if (ac->protocol == A_POP3 || ac->protocol == A_APOP ||
-                   ac->protocol == A_IMAP4 || ac->protocol == A_NNTP ||
-                   ac->protocol == A_LOCAL) {
+               if (ac->protocol == A_POP3 || ac->protocol == A_IMAP4 ||
+                   ac->protocol == A_NNTP || ac->protocol == A_LOCAL) {
                        ac->recv_at_getall ^= TRUE;
                        account_clist_set_row(ac, row);
                }
@@ -1043,11 +1042,6 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                              "POP3 (SSL)" :
                              ac_prefs->ssl_pop == SSL_STARTTLS ?
                              "POP3 (TLS)" : "POP3") :
-                            ac_prefs->protocol == A_APOP ?
-                            (ac_prefs->ssl_pop == SSL_TUNNEL ?
-                             "POP3 (APOP, SSL)" :
-                             ac_prefs->ssl_pop == SSL_STARTTLS ?
-                             "POP3 (APOP, TLS)" : "POP3 (APOP)") :
                             ac_prefs->protocol == A_IMAP4 ?
                             (ac_prefs->ssl_imap == SSL_TUNNEL ?
                              "IMAP4 (SSL)" :
@@ -1059,7 +1053,6 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                             "";
 #else
        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" : "";
@@ -1078,7 +1071,6 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
        }
 
        has_getallbox = (ac_prefs->protocol == A_POP3  ||
-                        ac_prefs->protocol == A_APOP  ||
                         ac_prefs->protocol == A_IMAP4 ||
                         ac_prefs->protocol == A_NNTP ||
                         ac_prefs->protocol == A_LOCAL);