0.8.11claws40

[claws.git] / src / news.c

diff --git a/src/news.c b/src/news.c
index 246a3b871f125ff9a9865b1f85affa69f81146f9..ef266cd373e6e800d40f3c292ef571b1be04bf17 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
@@ -106,11 +106,57 @@ GSList *news_get_msginfos          (Folder        *folder,
 gint news_post_stream                   (Folder        *folder, 
                                          FILE          *fp);
 
+FolderClass news_class =
+{
+       F_NEWS,
+       "news",
+       "News",
+
+       /* Folder functions */
+       news_folder_new,
+       news_folder_destroy,
+       NULL,
+       NULL,
+
+       /* FolderItem functions */
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       news_get_num_list,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+
+       /* Message functions */
+       news_get_msginfo,
+       news_get_msginfos,
+       news_fetch_msg,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       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;
 
        folder = (Folder *)g_new0(NewsFolder, 1);
+       folder->class = &news_class;
        news_folder_init(folder, name, path);
 
        return folder;
@@ -131,22 +177,7 @@ void news_folder_destroy(Folder *folder)
 static void news_folder_init(Folder *folder, const gchar *name,
                             const gchar *path)
 {
-       folder->type = F_NEWS;
-
        folder_remote_folder_init(folder, name, path);
-
-/*
-       folder->get_msg_list = news_get_article_list;
-*/
-       folder->fetch_msg    = news_fetch_msg;
-/*
-       folder->scan         = news_scan_group;
-*/
-       folder->destroy      = news_folder_destroy;
-       folder->remove_msg   = news_remove_msg;
-       folder->get_num_list = news_get_num_list;
-       folder->get_msginfo  = news_get_msginfo;
-       folder->get_msginfos = news_get_msginfos;
 }
 
 #if USE_OPENSSL
@@ -183,13 +214,11 @@ static Session *news_session_new(const gchar *server, gushort port,
                return NULL;
 
        session = g_new(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)->data             = NULL;
 
        SESSION(session)->destroy          = news_session_destroy;
@@ -252,7 +281,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 == 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) {
@@ -419,7 +448,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))
@@ -506,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 == 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);
@@ -525,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 == 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) {
@@ -546,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 == 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);
@@ -785,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(item->folder->type == 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);
@@ -833,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(item->folder->type == 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);
@@ -1019,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 == 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);