0.8.11claws50

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index 7ec2929c4a5bc83ea32a8d4b40bc52964472306b..a9b7d544f22d30a718cd1ed8048531847f9cbfef 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
@@ -110,36 +110,47 @@ FolderClass news_class =
 {
        F_NEWS,
        "news",
+       "News",
 
+       /* Folder functions */
+       news_folder_new,
+       news_folder_destroy,
        NULL,
        NULL,
-       news_fetch_msg,
-       news_get_msginfo,
-       news_get_msginfos,
+
+       /* FolderItem functions */
        NULL,
        NULL,
        NULL,
        NULL,
        NULL,
-       news_remove_msg,
-       NULL,
+       news_get_num_list,
        NULL,
        NULL,
        NULL,
-       news_get_num_list,
        NULL,
+
+       /* Message functions */
+       news_get_msginfo,
+       news_get_msginfos,
+       news_fetch_msg,
        NULL,
        NULL,
        NULL,
        NULL,
-       news_folder_destroy,
        NULL,
+       news_remove_msg,
        NULL,
        NULL,
        NULL,
        NULL,
 };
 
+FolderClass *news_get_class()
+{
+       return &news_class;
+}
+
 Folder *news_folder_new(const gchar *name, const gchar *path)
 {
        Folder *folder;
@@ -202,19 +213,17 @@ static Session *news_session_new(const gchar *server, gushort port,
        if (nntp_sock == NULL)
                return NULL;
 
-       session = g_new(NNTPSession, 1);
+       session = g_new0(NNTPSession, 1);
+       session_init(SESSION(session));
        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)->sock             = NULL;
        SESSION(session)->data             = NULL;
 
        SESSION(session)->destroy          = news_session_destroy;
 
-       session->group = NULL;
+       session->nntp_sock                 = nntp_sock;
+       session->group                     = NULL;
 
        return SESSION(session);
 }
@@ -223,7 +232,6 @@ void news_session_destroy(Session *session)
 {
        nntp_close(NNTP_SESSION(session)->nntp_sock);
        NNTP_SESSION(session)->nntp_sock = NULL;
-       session->sock = NULL;
 
        g_free(NNTP_SESSION(session)->group);
 }
@@ -272,7 +280,7 @@ 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(folder) == F_NEWS, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
        if (!rfolder->session) {
@@ -439,7 +447,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(folder) == 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))
@@ -460,7 +468,8 @@ GSList *news_get_group_list(Folder *folder)
                        g_free(filename);
                        return NULL;
                }
-               if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
+               if (recv_write_to_file
+                       (session->nntp_sock->sock, filename) < 0) {
                        log_warning("can't retrieve newsgroup list\n");
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(folder)->session = NULL;
@@ -526,7 +535,7 @@ void news_remove_group_list_cache(Folder *folder)
        gchar *path, *filename;
 
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(FOLDER_TYPE(folder) == 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);
@@ -545,7 +554,7 @@ gint news_post(Folder *folder, const gchar *file)
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(FOLDER_TYPE(folder) == F_NEWS, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
        g_return_val_if_fail(file != NULL, -1);
 
        if ((fp = fopen(file, "rb")) == NULL) {
@@ -566,7 +575,7 @@ gint news_post_stream(Folder *folder, FILE *fp)
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(FOLDER_TYPE(folder) == F_NEWS, -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);
@@ -805,7 +814,7 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
 
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
-       g_return_val_if_fail(FOLDER_TYPE(folder) == F_NEWS, -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);
@@ -837,7 +846,7 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
 
 #define READ_TO_LISTEND(hdr) \
        while (!(buf[0] == '.' && buf[1] == '\r')) { \
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) { \
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) { \
                        log_warning(_("error occurred while getting %s.\n"), hdr); \
                        return msginfo; \
                } \
@@ -853,7 +862,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
        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_TYPE(item->folder) == F_NEWS, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
 
        log_message(_("getting xover %d in %s...\n"),
                    num, item->path);
@@ -862,7 +871,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return NULL;
        }
        
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xover.\n"));
                return NULL;
        }
@@ -887,7 +896,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return msginfo;
        }
 
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xhdr.\n"));
                return msginfo;
        }
@@ -901,7 +910,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return msginfo;
        }
 
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xhdr.\n"));
                return msginfo;
        }
@@ -932,7 +941,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        }
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xover.\n"));
                        return newlist;
                }
@@ -971,7 +980,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        llast = newlist;
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
                        return newlist;
                }
@@ -1001,7 +1010,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        llast = newlist;
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
                        return newlist;
                }
@@ -1039,7 +1048,7 @@ GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
        guint tofetch, fetched;
        
        g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(FOLDER_TYPE(folder) == F_NEWS, 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);