when a 'protocol error' is encountered disconnect from the server

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index 3d6300e6c0e69ba2cf6567d2abb56bb485a777c6..327fdcc2a1e3f10a97ecf467864ce65a97b5f7b2 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -227,6 +227,7 @@ static Session *news_session_new_for_folder(Folder *folder)
        const gchar *userid = NULL;
        gchar *passwd = NULL;
        gushort port;
+       gchar buf[NNTPBUFSIZE];
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
@@ -250,6 +251,8 @@ static Session *news_session_new_for_folder(Folder *folder)
        port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
        session = news_session_new(ac->nntp_server, port, userid, passwd);
 #endif
+       if (ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
+               nntp_forceauth(NNTP_SESSION(session)->nntp_sock, buf, userid, passwd);
 
        g_free(passwd);
 
@@ -266,13 +269,11 @@ NNTPSession *news_session_get(Folder *folder)
 
        if (!rfolder->session) {
                rfolder->session = news_session_new_for_folder(folder);
-               statusbar_pop_all();
                return NNTP_SESSION(rfolder->session);
        }
 
        if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
                rfolder->session->last_access_time = time(NULL);
-               statusbar_pop_all();
                return NNTP_SESSION(rfolder->session);
        }
 
@@ -289,7 +290,6 @@ NNTPSession *news_session_get(Folder *folder)
 
        if (rfolder->session)
                rfolder->session->last_access_time = time(NULL);
-       statusbar_pop_all();
        return NNTP_SESSION(rfolder->session);
 }
 
@@ -341,8 +341,6 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
        procmsg_set_flags(alist, item);
 
-       statusbar_pop_all();
-
        return alist;
 }
 
@@ -373,7 +371,6 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        }
 
        ok = news_select_group(session, item->path, NULL, NULL, NULL);
-       statusbar_pop_all();
        if (ok != NN_SUCCESS) {
                g_warning("can't select group %s\n", item->path);
                g_free(filename);
@@ -383,9 +380,10 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        debug_print("getting article %d...\n", num);
        ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
                              num, filename);
-       statusbar_pop_all();
        if (ok < 0) {
                g_warning("can't read article %d\n", num);
+               session_destroy(SESSION(session));
+               REMOTE_FOLDER(folder)->session = NULL;
                g_free(filename);
                return NULL;
        }
@@ -503,10 +501,8 @@ GSList *news_get_group_list(Folder *folder)
 
                if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
                        g_free(filename);
-                       statusbar_pop_all();
                        return NULL;
                }
-               statusbar_pop_all();
                if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
                        log_warning("can't retrieve newsgroup list\n");
                        session_destroy(SESSION(session));
@@ -554,8 +550,6 @@ GSList *news_get_group_list(Folder *folder)
 
        list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
 
-       statusbar_pop_all();
-
        return list;
 }
 
@@ -606,8 +600,6 @@ gint news_post(Folder *folder, const gchar *file)
 
        fclose(fp);
 
-       statusbar_pop_all();
-
        return ok;
 }