2006-07-04 [colin] 2.3.1cvs57
[claws.git] / src / news.c
index e58d52a8572447067e2e9c322f69a827c174f3ad..aabeab341f829a99ec38d35354c5fc61e22816b0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,8 +32,8 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "intl.h"
 #include "news.h"
+#include "news_gtk.h"
 #include "nntp.h"
 #include "socket.h"
 #include "recv.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "inputdialog.h"
+#include "log.h"
+#include "progressindicator.h"
+#include "remotefolder.h"
 #include "alertpanel.h"
+#include "inc.h"
+
+#if USE_OPENSSL
+#  include "ssl.h"
+#endif
 
 #define NNTP_PORT      119
+#if USE_OPENSSL
+#define NNTPS_PORT     563
+#endif
+
+typedef struct _NewsFolder     NewsFolder;
+
+#define NEWS_FOLDER(obj)       ((NewsFolder *)obj)
+
+struct _NewsFolder
+{
+       RemoteFolder rfolder;
 
+       gboolean use_auth;
+       gboolean lock_count;
+};
+
+static void news_folder_init            (Folder        *folder,
+                                         const gchar   *name,
+                                         const gchar   *path);
+
+static Folder  *news_folder_new        (const gchar    *name,
+                                        const gchar    *folder);
+static void     news_folder_destroy    (Folder         *folder);
+
+static gchar *news_fetch_msg           (Folder         *folder,
+                                        FolderItem     *item,
+                                        gint            num);
+
+
+#if USE_OPENSSL
+static Session *news_session_new        (const gchar   *server,
+                                         gushort        port,
+                                         const gchar   *userid,
+                                         const gchar   *passwd,
+                                         SSLType        ssl_type);
+#else
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
                                          const gchar   *userid,
                                          const gchar   *passwd);
+#endif
 
 static gint news_get_article_cmd        (NNTPSession   *session,
                                          const gchar   *cmd,
@@ -62,78 +107,160 @@ static gint news_get_article_cmd   (NNTPSession   *session,
 static gint news_get_article            (NNTPSession   *session,
                                          gint           num,
                                          gchar         *filename);
-static gint news_get_header             (NNTPSession   *session,
-                                         gint           num,
-                                         gchar         *filename);
 
 static gint news_select_group           (NNTPSession   *session,
-                                         const gchar   *group);
-static GSList *news_get_uncached_articles(NNTPSession  *session,
-                                         FolderItem    *item,
-                                         gint           cache_last,
-                                         gint          *rfirst,
-                                         gint          *rlast);
+                                         const gchar   *group,
+                                         gint          *num,
+                                         gint          *first,
+                                         gint          *last);
 static MsgInfo *news_parse_xover        (const gchar   *xover_str);
 static gchar *news_parse_xhdr           (const gchar   *xhdr_str,
                                          MsgInfo       *msginfo);
-static GSList *news_delete_old_articles         (GSList        *alist,
-                                         FolderItem    *item,
-                                         gint           first);
-static void news_delete_all_articles    (FolderItem    *item);
+gint news_get_num_list                  (Folder        *folder, 
+                                         FolderItem    *item,
+                                         GSList       **list,
+                                         gboolean      *old_uids_valid);
+MsgInfo *news_get_msginfo               (Folder        *folder, 
+                                         FolderItem    *item,
+                                         gint           num);
+GSList *news_get_msginfos               (Folder        *folder,
+                                         FolderItem    *item,
+                                         GSList        *msgnum_list);
+gboolean news_scan_required             (Folder        *folder,
+                                         FolderItem    *item);
+
+gint news_post_stream                   (Folder        *folder, 
+                                         FILE          *fp);
+static gchar *news_folder_get_path      (Folder        *folder);
+gchar *news_item_get_path               (Folder        *folder,
+                                         FolderItem    *item);
+static void news_synchronise            (FolderItem    *item);
+static int news_remove_msg              (Folder        *folder, 
+                                         FolderItem    *item, 
+                                         gint           msgnum);
+static gint news_remove_folder          (Folder        *folder,
+                                         FolderItem    *item);
+static FolderClass news_class;
+
+FolderClass *news_get_class(void)
+{
+       if (news_class.idstr == NULL) {
+               news_class.type = F_NEWS;
+               news_class.idstr = "news";
+               news_class.uistr = "News";
+
+               /* Folder functions */
+               news_class.new_folder = news_folder_new;
+               news_class.destroy_folder = news_folder_destroy;
+
+               /* FolderItem functions */
+               news_class.item_get_path = news_item_get_path;
+               news_class.get_num_list = news_get_num_list;
+               news_class.scan_required = news_scan_required;
+               news_class.remove_folder = news_remove_folder;
+
+               /* Message functions */
+               news_class.get_msginfo = news_get_msginfo;
+               news_class.get_msginfos = news_get_msginfos;
+               news_class.fetch_msg = news_fetch_msg;
+               news_class.synchronise = news_synchronise;
+               news_class.remove_msg = news_remove_msg;
+       };
+
+       return &news_class;
+}
 
+static int news_remove_msg              (Folder        *folder, 
+                                         FolderItem    *item, 
+                                         gint           msgnum)
+{
+       gchar *path, *filename;
 
-static Session *news_session_new(const gchar *server, gushort port,
-                                const gchar *userid, const gchar *passwd)
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
+
+       path = folder_item_get_path(item);
+       if (!is_dir_exist(path))
+               make_dir_hier(path);
+       
+       filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msgnum), NULL);
+       g_free(path);
+       g_unlink(filename);
+       g_free(filename);
+       return 0;
+}
+
+static void news_folder_lock(NewsFolder *folder)
 {
-       gchar buf[NNTPBUFSIZE];
-       NNTPSession *session;
-       NNTPSockInfo *nntp_sock;
+       folder->lock_count++;
+}
 
-       g_return_val_if_fail(server != NULL, NULL);
+static void news_folder_unlock(NewsFolder *folder)
+{
+       if (folder->lock_count > 0)
+               folder->lock_count--;
+}
 
-       log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
+int news_folder_locked(Folder *folder)
+{
+       if (folder == NULL)
+               return 0;
 
-       if (userid && passwd)
-               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
-       else
-               nntp_sock = nntp_open(server, port, buf);
-       if (nntp_sock == NULL)
-               return NULL;
+       return NEWS_FOLDER(folder)->lock_count;
+}
 
-       session = g_new(NNTPSession, 1);
-       SESSION(session)->type             = SESSION_NEWS;
-       SESSION(session)->server           = g_strdup(server);
-       session->nntp_sock                 = nntp_sock;
-       SESSION(session)->sock             = nntp_sock->sock;
-       SESSION(session)->connected        = TRUE;
-       SESSION(session)->phase            = SESSION_READY;
-       SESSION(session)->last_access_time = time(NULL);
-       SESSION(session)->data             = NULL;
-       session->group = NULL;
+static Folder *news_folder_new(const gchar *name, const gchar *path)
+{
+       Folder *folder;
+
+       folder = (Folder *)g_new0(NewsFolder, 1);
+       folder->klass = &news_class;
+       news_folder_init(folder, name, path);
 
-       return SESSION(session);
+       return folder;
 }
 
-void news_session_destroy(NNTPSession *session)
+static void news_folder_destroy(Folder *folder)
 {
-       nntp_close(session->nntp_sock);
-       session->nntp_sock = NULL;
-       SESSION(session)->sock = NULL;
+       gchar *dir;
 
-       g_free(session->group);
+       dir = news_folder_get_path(folder);
+       if (is_dir_exist(dir))
+               remove_dir_recursive(dir);
+       g_free(dir);
+
+       folder_remote_folder_destroy(REMOTE_FOLDER(folder));
 }
 
-static gchar *news_query_password(const gchar *server, const gchar *user)
+static void news_folder_init(Folder *folder, const gchar *name,
+                            const gchar *path)
 {
-       gchar *message;
-       gchar *pass;
+       folder_remote_folder_init(folder, name, path);
+}
 
-       message = g_strdup_printf(_("Input password for %s on %s:"),
-                                 user, server);
-       pass = input_dialog_with_invisible(_("Input password"), message, NULL);
-       g_free(message);
+#if USE_OPENSSL
+static Session *news_session_new(const gchar *server, gushort port,
+                                const gchar *userid, const gchar *passwd,
+                                SSLType ssl_type)
+#else
+static Session *news_session_new(const gchar *server, gushort port,
+                                const gchar *userid, const gchar *passwd)
+#endif
+{
+       gchar buf[NNTPBUFSIZE];
+       Session *session;
+
+       g_return_val_if_fail(server != NULL, NULL);
+
+       log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
 
-       return pass;
+#if USE_OPENSSL
+       session = nntp_session_new(server, port, buf, userid, passwd, ssl_type);
+#else
+       session = nntp_session_new(server, port, buf, userid, passwd);
+#endif
+
+       return session;
 }
 
 static Session *news_session_new_for_folder(Folder *folder)
@@ -142,6 +269,8 @@ static Session *news_session_new_for_folder(Folder *folder)
        PrefsAccount *ac;
        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);
@@ -152,38 +281,66 @@ static Session *news_session_new_for_folder(Folder *folder)
                if (ac->passwd && ac->passwd[0])
                        passwd = g_strdup(ac->passwd);
                else
-                       passwd = news_query_password(ac->nntp_server, userid);
+                       passwd = input_dialog_query_password(ac->nntp_server,
+                                                            userid);
+       }
+
+#if USE_OPENSSL
+       port = ac->set_nntpport ? ac->nntpport
+               : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd,
+                                  ac->ssl_nntp);
+#else
+       if (ac->ssl_nntp != SSL_NONE) {
+               if (alertpanel_full(_("Insecure connection"),
+                       _("This connection is configured to be secured "
+                         "using SSL, but SSL is not available in this "
+                         "build of Sylpheed-Claws. \n\n"
+                         "Do you want to continue connecting to this "
+                         "server? The communication would not be "
+                         "secure."),
+                         GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
+                         NULL, FALSE, NULL, ALERT_WARNING,
+                         G_ALERTDEFAULT) != G_ALERTALTERNATE)
+                       return NULL;
        }
+       port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd);
+#endif
+       if ((session != NULL) && ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
+               nntp_forceauth(NNTP_SESSION(session), buf, userid, passwd);
 
-       session = news_session_new(ac->nntp_server,
-                                  ac->set_nntpport ? ac->nntpport : NNTP_PORT,
-                                  userid, passwd);
        g_free(passwd);
 
        return session;
 }
 
-NNTPSession *news_session_get(Folder *folder)
+static NNTPSession *news_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
 
        g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_NEWS, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the News server."))) {
+               return NULL;
+       }
+
        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();
+       if (time(NULL) - rfolder->session->last_access_time <
+               SESSION_TIMEOUT_INTERVAL) {
                return NNTP_SESSION(rfolder->session);
        }
 
-       if (nntp_mode(NNTP_SESSION(rfolder->session)->nntp_sock, FALSE)
+       if (nntp_mode(NNTP_SESSION(rfolder->session), FALSE)
            != NN_SUCCESS) {
                log_warning(_("NNTP connection to %s:%d has been"
                              " disconnected. Reconnecting...\n"),
@@ -195,57 +352,12 @@ NNTPSession *news_session_get(Folder *folder)
        }
 
        if (rfolder->session)
-               rfolder->session->last_access_time = time(NULL);
-       statusbar_pop_all();
-       return NNTP_SESSION(rfolder->session);
-}
-
-GSList *news_get_article_list(Folder *folder, FolderItem *item,
-                             gboolean use_cache)
-{
-       GSList *alist;
-       NNTPSession *session;
-
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_NEWS, NULL);
-
-       session = news_session_get(folder);
-
-       if (!session) {
-               alist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_cache(alist);
-       } else if (use_cache) {
-               GSList *newlist;
-               gint cache_last;
-               gint first, last;
-
-               alist = procmsg_read_cache(item, FALSE);
-
-               cache_last = procmsg_get_last_num_in_cache(alist);
-               newlist = news_get_uncached_articles
-                       (session, item, cache_last, &first, &last);
-               alist = news_delete_old_articles(alist, item, first);
+               session_set_access_time(rfolder->session);
 
-               alist = g_slist_concat(alist, newlist);
-               item->last_num = last;
-       } else {
-               gint last;
-
-               alist = news_get_uncached_articles
-                       (session, item, 0, NULL, &last);
-               news_delete_all_articles(item);
-               item->last_num = last;
-       }
-
-       procmsg_set_flags(alist, item);
-
-       statusbar_pop_all();
-
-       return alist;
+       return NNTP_SESSION(rfolder->session);
 }
 
-gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
+static gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
 {
        gchar *path, *filename;
        NNTPSession *session;
@@ -261,7 +373,7 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        g_free(path);
 
        if (is_file_exist(filename)) {
-               debug_print(_("article %d has been already cached.\n"), num);
+               debug_print("article %d has been already cached.\n", num);
                return filename;
        }
 
@@ -271,31 +383,32 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
                return NULL;
        }
 
-       ok = news_select_group(session, item->path);
-       statusbar_pop_all();
+       ok = news_select_group(session, item->path, NULL, NULL, NULL);
        if (ok != NN_SUCCESS) {
-               g_warning(_("can't select group %s\n"), item->path);
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(folder)->session = NULL;
+               }
                g_free(filename);
                return NULL;
        }
 
-       debug_print(_("getting article %d...\n"), 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);
+       if (ok != NN_SUCCESS) {
+               g_warning("can't read article %d\n", num);
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(folder)->session = NULL;
+               }
                g_free(filename);
                return NULL;
        }
-
+       GTK_EVENTS_FLUSH();
        return filename;
 }
 
-void news_scan_group(Folder *folder, FolderItem *item)
-{
-}
-
 static NewsGroupInfo *news_group_info_new(const gchar *name,
                                          gint first, gint last, gchar type)
 {
@@ -319,7 +432,7 @@ static void news_group_info_free(NewsGroupInfo *ginfo)
 static gint news_group_info_compare(NewsGroupInfo *ginfo1,
                                    NewsGroupInfo *ginfo2)
 {
-       return g_strcasecmp(ginfo1->name, ginfo2->name);
+       return g_ascii_strcasecmp(ginfo1->name, ginfo2->name);
 }
 
 GSList *news_get_group_list(Folder *folder)
@@ -331,7 +444,7 @@ GSList *news_get_group_list(Folder *folder)
        gchar buf[NNTPBUFSIZE];
 
        g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_NEWS, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
 
        path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
        if (!is_dir_exist(path))
@@ -339,8 +452,9 @@ GSList *news_get_group_list(Folder *folder)
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
        g_free(path);
 
-       if ((fp = fopen(filename, "r")) == NULL) {
+       if ((fp = g_fopen(filename, "rb")) == NULL) {
                NNTPSession *session;
+               gint ok;
 
                session = news_session_get(folder);
                if (!session) {
@@ -348,19 +462,24 @@ GSList *news_get_group_list(Folder *folder)
                        return NULL;
                }
 
-               if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
+               ok = nntp_list(session);
+               if (ok != NN_SUCCESS) {
+                       if (ok == NN_SOCKET) {
+                               session_destroy(SESSION(session));
+                               REMOTE_FOLDER(folder)->session = NULL;
+                       }
                        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));
+                       REMOTE_FOLDER(folder)->session = NULL;
                        g_free(filename);
                        return NULL;
                }
 
-               if ((fp = fopen(filename, "r")) == NULL) {
+               if ((fp = g_fopen(filename, "rb")) == NULL) {
                        FILE_OP_ERROR(filename, "fopen");
                        g_free(filename);
                        return NULL;
@@ -399,8 +518,6 @@ GSList *news_get_group_list(Folder *folder)
 
        list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
 
-       statusbar_pop_all();
-
        return list;
 }
 
@@ -420,7 +537,7 @@ void news_remove_group_list_cache(Folder *folder)
        gchar *path, *filename;
 
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_CLASS(folder) == &news_class);
 
        path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
@@ -435,32 +552,47 @@ void news_remove_group_list_cache(Folder *folder)
 
 gint news_post(Folder *folder, const gchar *file)
 {
-       NNTPSession *session;
        FILE *fp;
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->type == F_NEWS, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
        g_return_val_if_fail(file != NULL, -1);
 
-       session = news_session_get(folder);
-       if (!session) return -1;
-
-       if ((fp = fopen(file, "r")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
 
-       ok = nntp_post(session->nntp_sock, fp);
+       ok = news_post_stream(folder, fp);
+
+       fclose(fp);
+
+       return ok;
+}
+
+gint news_post_stream(Folder *folder, FILE *fp)
+{
+       NNTPSession *session;
+       gint ok;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
+       g_return_val_if_fail(fp != NULL, -1);
+
+       session = news_session_get(folder);
+       if (!session) return -1;
+
+       ok = nntp_post(session, fp);
        if (ok != NN_SUCCESS) {
                log_warning(_("can't post article.\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(folder)->session = NULL;
+               }
                return -1;
        }
 
-       fclose(fp);
-
-       statusbar_pop_all();
-
        return 0;
 }
 
@@ -468,20 +600,25 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
                                 gint num, gchar *filename)
 {
        gchar *msgid;
+       gint ok;
 
-       if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
-           != NN_SUCCESS)
-               return -1;
+       ok = nntp_get_article(session, cmd, num, &msgid);
+       if (ok != NN_SUCCESS)
+               return ok;
 
-       debug_print("Message-Id = %s, num = %d\n", msgid, num);
+       debug_print("Message-ID = %s, num = %d\n", msgid, num);
        g_free(msgid);
 
-       if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
+       ok = recv_write_to_file(SESSION(session)->sock, filename);
+       if (ok < 0) {
                log_warning(_("can't retrieve article %d\n"), num);
-               return -1;
+               if (ok == -2)
+                       return NN_SOCKET;
+               else
+                       return NN_IOERR;
        }
 
-       return 0;
+       return NN_SUCCESS;
 }
 
 static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
@@ -489,105 +626,433 @@ static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
        return news_get_article_cmd(session, "ARTICLE", num, filename);
 }
 
-static gint news_get_header(NNTPSession *session, gint num, gchar *filename)
-{
-       return news_get_article_cmd(session, "HEAD", num, filename);
-}
-
 /**
  * news_select_group:
  * @session: Active NNTP session.
  * @group: Newsgroup name.
+ * @num: Estimated number of articles.
+ * @first: First article number.
+ * @last: Last article number.
  *
  * Select newsgroup @group with the GROUP command if it is not already
- * selected in @session.
+ * selected in @session, or article numbers need to be returned.
  *
  * Return value: NNTP result code.
  **/
-static gint news_select_group(NNTPSession *session, const gchar *group)
+static gint news_select_group(NNTPSession *session, const gchar *group,
+                             gint *num, gint *first, gint *last)
 {
        gint ok;
-       gint num, first, last;
-
-       if (session->group && g_strcasecmp(session->group, group) == 0)
-               return NN_SUCCESS;
+       gint num_, first_, last_;
+
+       if (!num || !first || !last) {
+               if (session->group && g_ascii_strcasecmp(session->group, group) == 0)
+                       return NN_SUCCESS;
+               num = &num_;
+               first = &first_;
+               last = &last_;
+       }
 
        g_free(session->group);
        session->group = NULL;
 
-       ok = nntp_group(session->nntp_sock, group, &num, &first, &last);
+       ok = nntp_group(session, group, num, first, last);
        if (ok == NN_SUCCESS)
                session->group = g_strdup(group);
+       else
+               log_warning(_("can't select group: %s\n"), group);
 
        return ok;
 }
 
-static GSList *news_get_uncached_articles(NNTPSession *session,
-                                         FolderItem *item, gint cache_last,
-                                         gint *rfirst, gint *rlast)
+#define PARSE_ONE_PARAM(p, srcp) \
+{ \
+       p = strchr(srcp, '\t'); \
+       if (!p) return NULL; \
+       else \
+               *p++ = '\0'; \
+}
+
+static MsgInfo *news_parse_xover(const gchar *xover_str)
 {
-       gint ok;
-       gint num = 0, first = 0, last = 0, begin = 0, end = 0;
-       gchar buf[NNTPBUFSIZE];
-       GSList *newlist = NULL;
-       GSList *llast = NULL;
        MsgInfo *msginfo;
+       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
+       gchar *p;
+       gint num, size_int, line_int;
+       gchar *xover_buf;
 
-       if (rfirst) *rfirst = 0;
-       if (rlast)  *rlast  = 0;
+       Xstrdup_a(xover_buf, xover_str, return NULL);
 
-       g_return_val_if_fail(session != NULL, NULL);
+       PARSE_ONE_PARAM(subject, xover_buf);
+       PARSE_ONE_PARAM(sender, subject);
+       PARSE_ONE_PARAM(date, sender);
+       PARSE_ONE_PARAM(msgid, date);
+       PARSE_ONE_PARAM(ref, msgid);
+       PARSE_ONE_PARAM(size, ref);
+       PARSE_ONE_PARAM(line, size);
+       /*
+        * PARSE_ONE_PARAM(xref, line);
+        *
+         * if we parse extra headers we should first examine the
+        * LIST OVERVIEW.FMT response from the server. See
+        * RFC2980 for details
+        */
+
+       tmp = strchr(line, '\t');
+       if (!tmp) tmp = strchr(line, '\r');
+       if (!tmp) tmp = strchr(line, '\n');
+       if (tmp) *tmp = '\0';
+
+       num = atoi(xover_str);
+       size_int = atoi(size);
+       line_int = atoi(line);
+
+       /* set MsgInfo */
+       msginfo = procmsg_msginfo_new();
+       msginfo->msgnum = num;
+       msginfo->size = size_int;
+
+       msginfo->date = g_strdup(date);
+       msginfo->date_t = procheader_date_parse(NULL, date, 0);
+
+        msginfo->from = conv_unmime_header(sender, NULL);
+       msginfo->fromname = procheader_get_fromname(msginfo->from);
+
+        msginfo->subject = conv_unmime_header(subject, NULL);
+
+       remove_return(msginfo->from);
+       remove_return(msginfo->fromname);
+       remove_return(msginfo->subject);
+
+        if (msgid) {
+                extract_parenthesis(msgid, '<', '>');
+                remove_space(msgid);
+                if (*msgid != '\0')
+                        msginfo->msgid = g_strdup(msgid);
+        }                        
+
+        /* FIXME: this is a quick fix; references' meaning was changed
+         * into having the actual list of references in the References: header.
+         * We need a GSList here, so msginfo_free() and msginfo_copy() can do 
+         * their things properly. */ 
+        if (ref && strlen(ref)) {       
+               gchar **ref_tokens = g_strsplit(ref, " ", -1);
+               guint i = 0;
+               
+               while (ref_tokens[i]) {
+                       gchar *cur_ref = ref_tokens[i];
+                       msginfo->references = references_list_append(msginfo->references, 
+                                       cur_ref);
+                       i++;
+               }
+               g_strfreev(ref_tokens);
+               
+                eliminate_parenthesis(ref, '(', ')');
+                if ((p = strrchr(ref, '<')) != NULL) {
+                        extract_parenthesis(p, '<', '>');
+                        remove_space(p);
+                        if (*p != '\0')
+                                msginfo->inreplyto = g_strdup(p);
+                }
+        } 
+
+       return msginfo;
+}
+
+static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
+{
+       gchar *p;
+       gchar *tmp;
+       gint num;
+
+       p = strchr(xhdr_str, ' ');
+       if (!p)
+               return NULL;
+       else
+               p++;
+
+       num = atoi(xhdr_str);
+       if (msginfo->msgnum != num) return NULL;
+
+       tmp = strchr(p, '\r');
+       if (!tmp) tmp = strchr(p, '\n');
+
+       if (tmp)
+               return g_strndup(p, tmp - p);
+       else
+               return g_strdup(p);
+}
+
+gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
+{
+       gchar * tmp;
+       FILE * tmpfp;
+       gchar buf[BUFFSIZE];
+
+       tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
+                             G_DIR_SEPARATOR, (gint)msginfo);
+       if (tmp == NULL)
+               return -1;
+
+       if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
+               FILE_OP_ERROR(tmp, "fopen");
+               return -1;
+       }
+       if (change_file_mode_rw(tmpfp, tmp) < 0) {
+               FILE_OP_ERROR(tmp, "chmod");
+               g_warning("can't change file mode\n");
+       }
+       
+       fprintf(tmpfp, "From: %s\r\n", msginfo->from);
+       fprintf(tmpfp, "Newsgroups: %s\r\n", msginfo->newsgroups);
+       fprintf(tmpfp, "Subject: cmsg cancel <%s>\r\n", msginfo->msgid);
+       fprintf(tmpfp, "Control: cancel <%s>\r\n", msginfo->msgid);
+       fprintf(tmpfp, "Approved: %s\r\n", msginfo->from);
+       fprintf(tmpfp, "X-Cancelled-by: %s\r\n", msginfo->from);
+       get_rfc822_date(buf, sizeof(buf));
+       fprintf(tmpfp, "Date: %s\r\n", buf);
+       fprintf(tmpfp, "\r\n");
+       fprintf(tmpfp, "removed with sylpheed\r\n");
+
+       fclose(tmpfp);
+
+       news_post(folder, tmp);
+       remove(tmp);
+
+       g_free(tmp);
+
+       return 0;
+}
+
+static gchar *news_folder_get_path(Folder *folder)
+{
+       gchar *folder_path;
+
+        g_return_val_if_fail(folder->account != NULL, NULL);
+
+        folder_path = g_strconcat(get_news_cache_dir(),
+                                  G_DIR_SEPARATOR_S,
+                                  folder->account->nntp_server,
+                                  NULL);
+       return folder_path;
+}
+
+gchar *news_item_get_path(Folder *folder, FolderItem *item)
+{
+       gchar *folder_path, *path;
+
+       g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->folder != NULL, NULL);
-       g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
+       folder_path = news_folder_get_path(folder);
+
+        g_return_val_if_fail(folder_path != NULL, NULL);
+        if (folder_path[0] == G_DIR_SEPARATOR) {
+                if (item->path)
+                        path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+                                           item->path, NULL);
+                else
+                        path = g_strdup(folder_path);
+        } else {
+                if (item->path)
+                        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                           folder_path, G_DIR_SEPARATOR_S,
+                                           item->path, NULL);
+                else
+                        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                           folder_path, NULL);
+        }
+        g_free(folder_path);
+
+       return path;
+}
 
-       g_free(session->group);
-       session->group = NULL;
+gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, gboolean *old_uids_valid)
+{
+       NNTPSession *session;
+       gint i, ok, num, first, last, nummsgs = 0;
+       gchar *dir;
 
-       ok = nntp_group(session->nntp_sock, item->path,
-                       &num, &first, &last);
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
+
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, -1);
+
+       *old_uids_valid = TRUE;
+       
+       news_folder_lock(NEWS_FOLDER(item->folder));
+
+       ok = news_select_group(session, item->path, &num, &first, &last);
        if (ok != NN_SUCCESS) {
                log_warning(_("can't set group: %s\n"), item->path);
-               return NULL;
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return -1;
        }
-       session->group = g_strdup(item->path);
 
-       /* calculate getting overview range */
-       if (first > last) {
+       dir = news_folder_get_path(folder);
+       if (num <= 0)
+               remove_all_numbered_files(dir);
+       else if (last < first)
                log_warning(_("invalid article range: %d - %d\n"),
                            first, last);
+       else {
+               for (i = first; i <= last; i++) {
+                       *msgnum_list = g_slist_prepend(*msgnum_list, 
+                                                      GINT_TO_POINTER(i));
+                       nummsgs++;
+               }
+               debug_print("removing old messages from %d to %d in %s\n",
+                           first, last, dir);
+               remove_numbered_files(dir, 1, first - 1);
+       }
+       g_free(dir);
+       news_folder_unlock(NEWS_FOLDER(item->folder));
+       return nummsgs;
+}
+
+#define READ_TO_LISTEND(hdr) \
+       while (!(buf[0] == '.' && buf[1] == '\r')) { \
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) { \
+                       log_warning(_("error occurred while getting %s.\n"), hdr); \
+                       return msginfo; \
+               } \
+       }
+
+MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+       NNTPSession *session;
+       MsgInfo *msginfo = NULL;
+       gchar buf[NNTPBUFSIZE];
+       gint ok;
+
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->folder != NULL, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
+
+       log_message(_("getting xover %d in %s...\n"),
+                   num, item->path);
+       ok = nntp_xover(session, num, num);
+       
+       news_folder_lock(NEWS_FOLDER(item->folder));
+       
+       if (ok != NN_SUCCESS) {
+               log_warning(_("can't get xover\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
+               news_folder_unlock(NEWS_FOLDER(item->folder));
                return NULL;
        }
-       if (cache_last < first)
-               begin = first;
-       else if (last < cache_last)
-               begin = first;
-       else if (last == cache_last) {
-               debug_print(_("no new articles.\n"));
+       
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xover.\n"));
+               news_folder_unlock(NEWS_FOLDER(item->folder));
                return NULL;
-       } else
-               begin = cache_last + 1;
-       end = last;
+       }
+       
+       msginfo = news_parse_xover(buf);
+       if (!msginfo) {
+               log_warning(_("invalid xover line: %s\n"), buf);
+       }
+
+       READ_TO_LISTEND("xover");
+
+       if(!msginfo) {
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return NULL;
+       }
+
+       msginfo->folder = item;
+       msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+       msginfo->flags.tmp_flags = MSG_NEWS;
+       msginfo->newsgroups = g_strdup(item->path);
+
+       ok = nntp_xhdr(session, "to", num, num);
+       if (ok != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return msginfo;
+       }
 
-       if (rfirst) *rfirst = first;
-       if (rlast)  *rlast  = last;
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xhdr.\n"));
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return msginfo;
+       }
+
+       msginfo->to = news_parse_xhdr(buf, msginfo);
 
-       if (prefs_common.max_articles > 0 &&
-           end - begin + 1 > prefs_common.max_articles)
-               begin = end - prefs_common.max_articles + 1;
+       READ_TO_LISTEND("xhdr (to)");
+
+       ok = nntp_xhdr(session, "cc", num, num);
+       if (ok != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return msginfo;
+       }
+
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xhdr.\n"));
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return msginfo;
+       }
+
+       msginfo->cc = news_parse_xhdr(buf, msginfo);
+
+       READ_TO_LISTEND("xhdr (cc)");
+       news_folder_unlock(NEWS_FOLDER(item->folder));
+       return msginfo;
+}
+
+static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
+{
+       gchar buf[NNTPBUFSIZE];
+       GSList *newlist = NULL;
+       GSList *llast = NULL;
+       MsgInfo *msginfo;
+       guint count = 0, lines = (end - begin) + 2;
+       gint ok;
+
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
 
        log_message(_("getting xover %d - %d in %s...\n"),
                    begin, end, item->path);
-       if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
+       ok = nntp_xover(session, begin, end);
+       if (ok != NN_SUCCESS) {
                log_warning(_("can't get xover\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
                return NULL;
        }
 
+       news_folder_lock(NEWS_FOLDER(item->folder));
+       
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xover.\n"));
+                       news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }
+               count++;
+               progressindicator_set_percentage
+                       (PROGRESS_TYPE_NETWORK,
+                        session->fetch_base_percentage +
+                        (((gfloat) count) / ((gfloat) lines)) * session->fetch_total_percentage);
 
                if (buf[0] == '.' && buf[1] == '\r') break;
 
@@ -610,8 +1075,14 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
                }
        }
 
-       if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+       ok = nntp_xhdr(session, "to", begin, end);
+       if (ok != NN_SUCCESS) {
                log_warning(_("can't get xhdr\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
+               news_folder_unlock(NEWS_FOLDER(item->folder));
                return newlist;
        }
 
@@ -620,6 +1091,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
+                       news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }
 
@@ -635,8 +1107,14 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
                llast = llast->next;
        }
 
-       if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+       ok = nntp_xhdr(session, "cc", begin, end);
+       if (ok != NN_SUCCESS) {
                log_warning(_("can't get xhdr\n"));
+               if (ok == NN_SOCKET) {
+                       session_destroy(SESSION(session));
+                       REMOTE_FOLDER(item->folder)->session = NULL;
+               }
+               news_folder_unlock(NEWS_FOLDER(item->folder));
                return newlist;
        }
 
@@ -645,6 +1123,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
+                       news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }
 
@@ -659,149 +1138,93 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
                llast = llast->next;
        }
+       news_folder_unlock(NEWS_FOLDER(item->folder));
 
-       return newlist;
-}
+       session_set_access_time(SESSION(session));
 
-#define PARSE_ONE_PARAM(p, srcp) \
-{ \
-       p = strchr(srcp, '\t'); \
-       if (!p) return NULL; \
-       else \
-               *p++ = '\0'; \
+       return newlist;
 }
 
-static MsgInfo *news_parse_xover(const gchar *xover_str)
+GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
 {
-       MsgInfo *msginfo;
-       gchar buf[NNTPBUFSIZE];
-       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
-       gchar *p;
-       gint num, size_int, line_int;
-       gchar *xover_buf;
-
-       Xstrdup_a(xover_buf, xover_str, return NULL);
-
-       PARSE_ONE_PARAM(subject, xover_buf);
-       PARSE_ONE_PARAM(sender, subject);
-       PARSE_ONE_PARAM(date, sender);
-       PARSE_ONE_PARAM(msgid, date);
-       PARSE_ONE_PARAM(ref, msgid);
-       PARSE_ONE_PARAM(size, ref);
-       PARSE_ONE_PARAM(line, size);
-
-       tmp = strchr(line, '\t');
-       if (!tmp) tmp = strchr(line, '\r');
-       if (!tmp) tmp = strchr(line, '\n');
-       if (tmp) *tmp = '\0';
-
-       num = atoi(xover_str);
-       size_int = atoi(size);
-       line_int = atoi(line);
-
-       /* set MsgInfo */
-       msginfo = g_new0(MsgInfo, 1);
-       msginfo->msgnum = num;
-       msginfo->size = size_int;
-
-       msginfo->date = g_strdup(date);
-       msginfo->date_t = procheader_date_parse(NULL, date, 0);
-
-       conv_unmime_header(buf, sizeof(buf), sender, NULL);
-       msginfo->from = g_strdup(buf);
-       msginfo->fromname = procheader_get_fromname(buf);
-
-       conv_unmime_header(buf, sizeof(buf), subject, NULL);
-       msginfo->subject = g_strdup(buf);
-
-       extract_parenthesis(msgid, '<', '>');
-       remove_space(msgid);
-       if (*msgid != '\0')
-               msginfo->msgid = g_strdup(msgid);
+       NNTPSession *session;
+       GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
+       guint first, last, next;
+       guint tofetch, fetched;
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+       g_return_val_if_fail(msgnum_list != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
 
-       msginfo->references = g_strdup(ref);
-       eliminate_parenthesis(ref, '(', ')');
-       if ((p = strrchr(ref, '<')) != NULL) {
-               extract_parenthesis(p, '<', '>');
-               remove_space(p);
-               if (*p != '\0')
-                       msginfo->inreplyto = g_strdup(p);
+       tmp_msgnum_list = g_slist_copy(msgnum_list);
+       tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
+
+       progressindicator_start(PROGRESS_TYPE_NETWORK);
+       tofetch = g_slist_length(tmp_msgnum_list);
+       fetched = 0;
+
+       first = GPOINTER_TO_INT(tmp_msgnum_list->data);
+       last = first;
+       
+       news_folder_lock(NEWS_FOLDER(item->folder));
+       
+       for(elem = g_slist_next(tmp_msgnum_list); elem != NULL; elem = g_slist_next(elem)) {
+               next = GPOINTER_TO_INT(elem->data);
+               if(next != (last + 1)) {
+                       session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
+                       session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((gfloat) tofetch);
+                       tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+                       msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+                       fetched = last - first + 1;
+                       first = next;
+               }
+               last = next;
        }
-
-       return msginfo;
+       
+       news_folder_unlock(NEWS_FOLDER(item->folder));
+       
+       session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
+       session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((gfloat) tofetch);
+       tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+       msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+
+       g_slist_free(tmp_msgnum_list);
+       
+       progressindicator_stop(PROGRESS_TYPE_NETWORK);
+
+       return msginfo_list;
 }
 
-static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
+gboolean news_scan_required(Folder *folder, FolderItem *item)
 {
-       gchar *p;
-       gchar *tmp;
-       gint num;
-
-       p = strchr(xhdr_str, ' ');
-       if (!p)
-               return NULL;
-       else
-               p++;
-
-       num = atoi(xhdr_str);
-       if (msginfo->msgnum != num) return NULL;
-
-       tmp = strchr(p, '\r');
-       if (!tmp) tmp = strchr(p, '\n');
-
-       if (tmp)
-               return g_strndup(p, tmp - p);
-       else
-               return g_strdup(p);
+       return TRUE;
 }
 
-static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
-                                       gint first)
+void news_synchronise(FolderItem *item) 
 {
-       GSList *cur, *next;
-       MsgInfo *msginfo;
-       gchar *dir;
-
-       g_return_val_if_fail(item != NULL, alist);
-       g_return_val_if_fail(item->folder != NULL, alist);
-       g_return_val_if_fail(item->folder->type == F_NEWS, alist);
-
-       if (first < 2) return alist;
-
-       debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
-
-       dir = folder_item_get_path(item);
-       remove_numbered_files(dir, 1, first - 1);
-       g_free(dir);
-
-       for (cur = alist; cur != NULL; ) {
-               next = cur->next;
-
-               msginfo = (MsgInfo *)cur->data;
-               if (msginfo && msginfo->msgnum < first) {
-                       procmsg_msginfo_free(msginfo);
-                       alist = g_slist_remove(alist, msginfo);
-               }
-
-               cur = next;
-       }
-
-       return alist;
+       news_gtk_synchronise(item);
 }
 
-static void news_delete_all_articles(FolderItem *item)
+static gint news_remove_folder(Folder *folder, FolderItem *item)
 {
-       gchar *dir;
-
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
+       gchar *path;
 
-       debug_print(_("\tDeleting all cached articles... "));
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->path != NULL, -1);
 
-       dir = folder_item_get_path(item);
-       remove_all_numbered_files(dir);
-       g_free(dir);
+       path = folder_item_get_path(item);
+       if (remove_dir_recursive(path) < 0) {
+               g_warning("can't remove directory `%s'\n", path);
+               g_free(path);
+               return -1;
+       }
 
-       debug_print(_("done.\n"));
+       g_free(path);
+       folder_item_remove(item);
+       return 0;
 }