2006-07-04 [colin] 2.3.1cvs57

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index dfefe56e64f3b271522ce178a6fbbd154d55ae15..aabeab341f829a99ec38d35354c5fc61e22816b0 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -135,9 +135,11 @@ 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_dummy_remove            (Folder        *folder, 
+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)
@@ -155,23 +157,36 @@ FolderClass *news_get_class(void)
                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_dummy_remove;
+               news_class.remove_msg = news_remove_msg;
        };
 
        return &news_class;
 }
 
-static int news_dummy_remove            (Folder        *folder, 
+static int news_remove_msg              (Folder        *folder, 
                                          FolderItem    *item, 
                                          gint           msgnum)
 {
-       debug_print("doing nothing on purpose\n");
+       gchar *path, *filename;
+
+       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;
 }
 
@@ -284,10 +299,9 @@ static Session *news_session_new_for_folder(Folder *folder)
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Con_tinue connecting"), 
-                         GTK_STOCK_CANCEL, NULL,
-                         FALSE, NULL, ALERT_WARNING,
-                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                         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;
@@ -309,7 +323,10 @@ static 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 && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the News server."))) {
                return NULL;
        }
 
@@ -703,6 +720,10 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
 
         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);
@@ -735,15 +756,6 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
                 }
         } 
 
-       /*
-       msginfo->xref = g_strdup(xref);
-       p = msginfo->xref+strlen(msginfo->xref) - 1;
-       while (*p == '\r' || *p == '\n') {
-               *p = '\0';
-               p--;
-       }
-       */
-
        return msginfo;
 }
 
@@ -1010,7 +1022,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        GSList *newlist = NULL;
        GSList *llast = NULL;
        MsgInfo *msginfo;
-       guint count = 0, lines = (end - begin + 2) * 3;
+       guint count = 0, lines = (end - begin) + 2;
        gint ok;
 
        g_return_val_if_fail(session != NULL, NULL);
@@ -1082,11 +1094,6 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
                        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;
                if (!llast) {
@@ -1119,11 +1126,6 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
                        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;
                if (!llast) {
@@ -1206,3 +1208,23 @@ void news_synchronise(FolderItem *item)
 {
        news_gtk_synchronise(item);
 }
+
+static gint news_remove_folder(Folder *folder, FolderItem *item)
+{
+       gchar *path;
+
+       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);
+
+       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;
+       }
+
+       g_free(path);
+       folder_item_remove(item);
+       return 0;
+}