2006-07-04 [colin] 2.3.1cvs57

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index 2ae1e13bb93c89873855d3475604830f46181a18..aabeab341f829a99ec38d35354c5fc61e22816b0 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -135,7 +135,7 @@ 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,
@@ -164,17 +164,29 @@ FolderClass *news_get_class(void)
                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;
 }
 
@@ -287,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;
@@ -709,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);
@@ -741,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;
 }