prefs_fonts: be a little more user-friendly with the labels; news.c: remove unneeded...

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index e68cd5286bbbf0b5373d32da0ab83da3335c0433..910188bdafb0f90b0b107f0a4952bb7c00c89097 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -40,7 +40,6 @@
 #include "procheader.h"
 #include "folder.h"
 #include "session.h"
-#include "statusbar.h"
 #include "codeconv.h"
 #include "utils.h"
 #include "prefs_common.h"
@@ -48,6 +47,8 @@
 #include "inputdialog.h"
 #include "log.h"
 #include "progressindicator.h"
+#include "remotefolder.h"
+#include "alertpanel.h"
 #if USE_OPENSSL
 #  include "ssl.h"
 #endif
@@ -57,15 +58,30 @@
 #define NNTPS_PORT     563
 #endif
 
-static Folder *news_folder_new(const gchar * name, const gchar * folder);
-static void news_folder_destroy(Folder * folder);
+typedef struct _NewsFolder     NewsFolder;
 
-static gchar *news_fetch_msg(Folder * folder, FolderItem * item, gint num);
+#define NEWS_FOLDER(obj)       ((NewsFolder *)obj)
+
+struct _NewsFolder
+{
+       RemoteFolder rfolder;
+
+       gboolean use_auth;
+};
 
 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,
@@ -97,13 +113,16 @@ static gchar *news_parse_xhdr               (const gchar   *xhdr_str,
                                          MsgInfo       *msginfo);
 gint news_get_num_list                  (Folder        *folder, 
                                          FolderItem    *item,
-                                         GSList       **list);
+                                         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);
@@ -111,7 +130,7 @@ static gchar *news_folder_get_path   (Folder        *folder);
 gchar *news_item_get_path               (Folder        *folder,
                                          FolderItem    *item);
 
-FolderClass news_class =
+static FolderClass news_class =
 {
        F_NEWS,
        "news",
@@ -122,10 +141,14 @@ FolderClass news_class =
        news_folder_destroy,
        NULL,
        NULL,
+       NULL,
+       NULL,
 
        /* FolderItem functions */
        NULL,
        NULL,
+       NULL,
+       NULL,
        news_item_get_path,
        NULL,
        NULL,
@@ -135,7 +158,7 @@ FolderClass news_class =
        NULL,
        NULL,
        NULL,
-       NULL,
+       news_scan_required,
 
        /* Message functions */
        news_get_msginfo,
@@ -156,7 +179,7 @@ FolderClass *news_get_class(void)
        return &news_class;
 }
 
-Folder *news_folder_new(const gchar *name, const gchar *path)
+static Folder *news_folder_new(const gchar *name, const gchar *path)
 {
        Folder *folder;
 
@@ -167,7 +190,7 @@ Folder *news_folder_new(const gchar *name, const gchar *path)
        return folder;
 }
 
-void news_folder_destroy(Folder *folder)
+static void news_folder_destroy(Folder *folder)
 {
        gchar *dir;
 
@@ -249,7 +272,7 @@ static Session *news_session_new_for_folder(Folder *folder)
        return session;
 }
 
-NNTPSession *news_session_get(Folder *folder)
+static NNTPSession *news_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
 
@@ -257,6 +280,9 @@ NNTPSession *news_session_get(Folder *folder)
        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)
+               return NULL;
+
        if (!rfolder->session) {
                rfolder->session = news_session_new_for_folder(folder);
                return NNTP_SESSION(rfolder->session);
@@ -283,7 +309,7 @@ NNTPSession *news_session_get(Folder *folder)
        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;
@@ -581,7 +607,7 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
 {
        MsgInfo *msginfo;
        gchar buf[NNTPBUFSIZE];
-       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp, *xref;
+       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
        gchar *p;
        gint num, size_int, line_int;
        gchar *xover_buf;
@@ -595,9 +621,15 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
        PARSE_ONE_PARAM(ref, msgid);
        PARSE_ONE_PARAM(size, ref);
        PARSE_ONE_PARAM(line, size);
-       PARSE_ONE_PARAM(xref, line);
-
-       tmp = strchr(xref, '\t');
+       /*
+        * 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';
@@ -635,12 +667,14 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
                        msginfo->inreplyto = g_strdup(p);
        }
 
+       /*
        msginfo->xref = g_strdup(xref);
        p = msginfo->xref+strlen(msginfo->xref) - 1;
        while (*p == '\r' || *p == '\n') {
                *p = '\0';
                p--;
        }
+       */
 
        return msginfo;
 }
@@ -752,7 +786,7 @@ gchar *news_item_get_path(Folder *folder, FolderItem *item)
        return path;
 }
 
-gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
+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;
@@ -765,26 +799,30 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
        session = news_session_get(folder);
        g_return_val_if_fail(session != NULL, -1);
 
+       *old_uids_valid = TRUE;
+
        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 -1;
        }
 
-       if(last < first) {
+       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);
-               return 0;
-       }
-
-       for(i = first; i <= last; i++) {
-               *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(i));
-               nummsgs++;
+       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);
        }
-
-       dir = folder_item_get_path(item);
-       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);
 
        return nummsgs;
@@ -1028,3 +1066,8 @@ GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
 
        return msginfo_list;
 }
+
+gboolean news_scan_required(Folder *folder, FolderItem *item)
+{
+       return TRUE;
+}