news scoring

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 24c6e21d981b27cbf71cc1e42872b1054940065d..76fad9246b8435f7261db5c5c4b25d35169ff6cf 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,19 @@
+2001-05-06 [hoa]
+
+       * removed src/headers_display.[ch]
+       * removed src/prefs_display_headers.[ch]
+       * src/inc.c
+               use a temporary file in the user directory for mbox import
+       * src/news.c
+               added XHDR support to get "To" and "Cc" headers
+               (in order to match news with to or cc field for
+               scoring)
+               added function news_parse_xhdr() to get XHDR response
+       * src/nntp.[ch]
+               added function nntp_xhdr()
+       * src/matcher.c
+               fetch the message if necessary
+
 2001-05-06 [alfons]
 
        0.4.66claws3

diff --git a/src/headers_display.c b/src/headers_display.c
deleted file mode 100644 (file)
index 8f79293..0000000
--- a/src/headers_display.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <glib.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-#include "intl.h"
-#include "headers_display.h"
-#include "utils.h"
-
-
-gchar * header_display_prop_get_str(HeaderDisplayProp *dp)
-{
-       return g_strdup_printf
-               ("%s%s", dp->hidden?"-":"", dp->name);
-}
- 
-HeaderDisplayProp * header_display_prop_read_str(gchar * buf)
-{
-       HeaderDisplayProp * dp;
-
-       dp = g_new0(HeaderDisplayProp, 1);
-
-       dp->hidden = 0;
-       if (*buf == '-') {
-               dp->hidden = 1;
-               buf ++;
-       }
-       if (*buf == 0) {
-               g_free(dp);
-               return NULL;
-       }
-       dp->name = g_strdup(buf);
-
-       return dp;
-}
- 
-void header_display_prop_free(HeaderDisplayProp *dp)
-{
-       if (!dp) return;
- 
-       if (dp->name)
-               g_free(dp->name);
- 
-       g_free(dp);
-}

diff --git a/src/headers_display.h b/src/headers_display.h
deleted file mode 100644 (file)
index 689c4dd..0000000
--- a/src/headers_display.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __HEADERS_DISPLAY_H__
-#define __HEADERS_DISPLAY_H__
-
-struct _HeaderDisplayProp
-{
-       gchar *name;
-       int hidden;
-};
-
-typedef struct _HeaderDisplayProp HeaderDisplayProp;
-
-gchar * header_display_prop_get_str(HeaderDisplayProp *dp);
-HeaderDisplayProp * header_display_prop_read_str(gchar * buf);
-void header_display_prop_free(HeaderDisplayProp *dp);
-
-#endif /* __DISPLAY_H__ */

diff --git a/src/inc.c b/src/inc.c
index 133d3c2d0d28c77ffaabd4683152efedea2e6830..cf1716ca42f3caa773f2bff071fc08cfb19af4b8 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -894,7 +894,8 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
 {
        gint msgs, size;
        gint lockfd;
-       gchar tmp_mbox[256] = "/tmp/tmpmboxXXXXXX";
+       /*      gchar tmp_mbox[256] = "/tmp/tmpmboxXXXXXX"; */
+       gchar tmp_mbox[MAXPATHLEN + 1];
        GHashTable *folder_table = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -909,8 +910,12 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
                return -1;
 
+       g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox%d",
+                  get_rc_dir(), G_DIR_SEPARATOR, (gint)mbox);
+       /*
        if (mktemp(tmp_mbox) == NULL)
                return -1;
+       */
 
        if (copy_mbox(mbox, tmp_mbox) < 0)
                return -1;

diff --git a/src/matcher.c b/src/matcher.c
index 2e6a5a1e46d0cafef403c7666c8867a386892716..6becce60d0e09d22cb604f73a70320f90443ef40 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -782,7 +782,7 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
        if (!read_headers && !read_body)
                return result;
 
-       file = procmsg_get_message_file_path(info);
+       file = procmsg_get_message_file(info);
        g_return_if_fail(file != NULL);
 
        if ((fp = fopen(file, "r")) == NULL) {

diff --git a/src/news.c b/src/news.c
index fcf7c9581e8d212c662813bd7582759549fa7a27..cb9df7d7263e37f3d203033f5d40b52529b4c374 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -65,6 +65,8 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
                                          gint          *rfirst,
                                          gint          *rlast);
 static MsgInfo *news_parse_xover        (const gchar   *xover_str);
+static gchar * news_parse_xhdr           (const gchar *xover_str,
+                                         MsgInfo * info);
 static GSList *news_delete_old_article  (GSList        *alist,
                                          gint           first);
 static void news_delete_all_article     (FolderItem    *item);
@@ -445,6 +447,61 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
                }
        }
 
+       if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return NULL;
+       }
+
+       llast = newlist;
+
+       for (;;) {
+               gchar * value;
+               
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xover.\n"));
+                       return newlist;
+               }
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+
+               msginfo = (MsgInfo *) llast->data;
+
+               value = news_parse_xhdr(buf, msginfo);
+
+               if (value)
+                       msginfo->to = value;
+
+               llast = llast->next;
+               
+       }
+
+       if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return NULL;
+       }
+
+       llast = newlist;
+
+       for (;;) {
+               gchar * value;
+               
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xover.\n"));
+                       return newlist;
+               }
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+
+               msginfo = (MsgInfo *) llast->data;
+
+               value = news_parse_xhdr(buf, msginfo);
+
+               if (value)
+                       msginfo->cc = value;
+
+               llast = llast->next;
+       }
+
        if (rfirst) *rfirst = first;
        if (rlast)  *rlast  = last;
        return newlist;
@@ -518,6 +575,26 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
        return msginfo;
 }
 
+static gchar * news_parse_xhdr(const gchar *xover_str, MsgInfo * info)
+{
+       gchar buf[NNTPBUFSIZE];
+       gchar *p;
+       gint num;
+
+       p = strchr(xover_str, ' ');
+       if (!p)
+               return NULL;
+       else
+               p++;
+
+       num = atoi(xover_str);
+
+       if (info->msgnum != num)
+               return NULL;
+
+       return g_strdup(p);
+}
+
 static GSList *news_delete_old_article(GSList *alist, gint first)
 {
        GSList *cur, *next;

diff --git a/src/nntp.c b/src/nntp.c
index 0fa9332a1fa6324c99968aabc652424049c059df..2b0b202c5a1e112c7b51c57f84c0fcd98113bce3 100644 (file)
--- a/src/nntp.c
+++ b/src/nntp.c
@@ -187,6 +187,18 @@ gint nntp_xover(NNTPSockInfo *sock, gint first, gint last)
        return NN_SUCCESS;
 }
 
+gint nntp_xhdr(NNTPSockInfo *sock, gchar * header, gint first, gint last)
+{
+       gint ok;
+       gchar buf[NNTPBUFSIZE];
+
+       ok = nntp_gen_command(sock, buf, "XHDR %s %d-%d", header, first, last);
+       if (ok != NN_SUCCESS)
+               return ok;
+
+       return NN_SUCCESS;
+}
+
 gint nntp_post(NNTPSockInfo *sock, FILE *fp)
 {
        gint ok;

diff --git a/src/nntp.h b/src/nntp.h
index 890c05e145f83a4b776366e5b76481fb55430890..643c6ddbf6a839f5a92c1122221ab13e5fea564c 100644 (file)
--- a/src/nntp.h
+++ b/src/nntp.h
@@ -63,5 +63,6 @@ gint nntp_newnews(NNTPSockInfo *sock);
 gint nntp_mode(NNTPSockInfo *sock, gboolean stream);
 gint nntp_ok(NNTPSockInfo *sock, gchar *argbuf);
 gint nntp_list(NNTPSockInfo *sock);
+gint nntp_xhdr(NNTPSockInfo *sock, gchar * header, gint first, gint last);
 
 #endif /* __NNTP_H__ */

diff --git a/src/prefs_display_headers.c b/src/prefs_display_headers.c
deleted file mode 100644 (file)
index d7799dc..0000000
--- a/src/prefs_display_headers.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "defs.h"
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "intl.h"
-#include "main.h"
-#include "prefs.h"
-#include "prefs_display_headers.h"
-#include "prefs_common.h"
-#include "mainwindow.h"
-#include "foldersel.h"
-#include "manage_window.h"
-#include "utils.h"
-#include "gtkutils.h"
-#include "alertpanel.h"
-#include "folder.h"
-#include "headers_display.h"
-
-static struct Headers {
-       GtkWidget *window;
-
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-
-       GtkWidget *hdr_combo;
-       GtkWidget *hdr_entry;
-/*     GtkWidget *key_check; */
-       GtkWidget *headers_clist;
-       GtkWidget *hidden_headers_clist;
-
-       GtkWidget *other_headers;
-} headers;
-
-/*
-   parameter name, default value, pointer to the prefs variable, data type,
-   pointer to the widget pointer,
-   pointer to the function for data setting,
-   pointer to the function for widget setting
- */
-
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
-
-/* widget creating functions */
-static void prefs_display_headers_create       (void);
-
-static void prefs_display_headers_set_dialog   (void);
-static void prefs_display_headers_set_list     (void);
-/* static gint prefs_display_headers_clist_set_row     (gint    row); */
-static gint prefs_display_headers_clist_set_row(gboolean hidden);
-/*static gint prefs_display_headers_clist_set_row      (void);*/
-
-/* callback functions */
-/*  static void prefs_display_headers_select_dest_cb(void); */
-static void prefs_display_headers_register_cb(GtkButton *btn,
-                                             void * hidden_data);
-/*
-static void prefs_display_headers_register_cb  (void);
-static void prefs_display_headers_substitute_cb        (void);
-*/
-static void prefs_display_headers_delete_cb(GtkButton *btn, void * clist_data);
-static void prefs_display_headers_up           (void);
-static void prefs_display_headers_down         (void);
-static void prefs_display_headers_select       (GtkCList       *clist,
-                                                gint            row,
-                                                gint            column,
-                                                GdkEvent       *event);
-
-static void prefs_display_headers_other_headers_toggled(void);
-
-static void prefs_display_headers_key_pressed  (GtkWidget      *widget,
-                                                GdkEventKey    *event,
-                                                gpointer        data);
-static void prefs_display_headers_ok           (GtkButton      *button);
-static void prefs_display_headers_cancel       (GtkButton      *button);
-
-PrefsDisplayHeaders prefs_display_headers = { 1, NULL};
-
-static gchar *defaults[] =
-{
-       "Sender",
-       "From",
-       "Reply-To",
-       "To",
-       "Cc",
-       "Subject",
-       "Date",
-       "User-Agent",
-       "X-Mailer",
-       "-Received",
-       "-Message-Id",
-       "-In-Reply-To",
-       "-References",
-       "-Mime-Version",
-       "-Content-Type",
-       "-Content-Transfer-Encoding",
-       "-X-UIDL",
-       "-Precedence",
-       "-Status",
-       "-Priority"
-};
-
-static void prefs_display_headers_set_default(void)
-{
-       int i;
-
-       for(i = 0; i < sizeof(defaults) / sizeof(defaults[0]); i++) {
-               HeaderDisplayProp *dp =
-                       header_display_prop_read_str(defaults[i]);
-               prefs_display_headers.headers_list =
-                       g_slist_append(prefs_display_headers.headers_list, dp);
-       }
-}
-
-#define ENTRY_SET_TEXT(entry, str) \
-       gtk_entry_set_text(GTK_ENTRY(entry), str ? str : "")
-
-void prefs_display_headers_open(void)
-{
-       if (!headers.window) {
-               prefs_display_headers_create();
-       }
-
-       manage_window_set_transient(GTK_WINDOW(headers.window));
-       gtk_widget_grab_focus(headers.ok_btn);
-
-       prefs_display_headers_set_dialog();
-
-       gtk_widget_show(headers.window);
-}
-
-static void prefs_display_headers_create(void)
-{
-       GtkWidget *window;
-       GtkWidget *vbox;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-       GtkWidget *confirm_area;
-
-       GtkWidget *vbox1;
-
-       GtkWidget *hbox1;
-       GtkWidget *hdr_label;
-       GtkWidget *hdr_combo;
-/*     GtkWidget *key_check; */
-
-       GtkWidget *reg_hbox;
-       GtkWidget *btn_hbox;
-       GtkWidget *arrow;
-       GtkWidget *reg_btn;
-/*     GtkWidget *subst_btn; */
-       GtkWidget *del_btn;
-
-       GtkWidget *ch_hbox;
-       GtkWidget *ch_scrolledwin;
-       GtkWidget *headers_clist;
-       GtkWidget *hidden_headers_clist;
-
-       GtkWidget *btn_vbox;
-       GtkWidget *up_btn;
-       GtkWidget *down_btn;
-
-       GtkWidget *checkbtn_other_headers;
-
-       /*      gchar *title[] = {_("Header name"), _("Action")}; */
-       gchar *title[1];
-
-       debug_print(_("Creating headers setting window...\n"));
-
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-       gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-
-       vbox = gtk_vbox_new (FALSE, 6);
-       gtk_widget_show (vbox);
-       gtk_container_add (GTK_CONTAINER (window), vbox);
-
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
-       gtk_widget_show (confirm_area);
-       gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default (ok_btn);
-
-       gtk_window_set_title (GTK_WINDOW(window),
-                             _("Headers setting"));
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
-                           GTK_SIGNAL_FUNC(prefs_display_headers_key_pressed),
-                           NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_display_headers_ok),
-                           NULL);
-       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_display_headers_cancel),
-                           NULL);
-
-       vbox1 = gtk_vbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
-       gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
-
-       hdr_label = gtk_label_new (_("Header"));
-       gtk_widget_show (hdr_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), hdr_label, FALSE, FALSE, 0);
-
-       hdr_combo = gtk_combo_new ();
-       gtk_widget_show (hdr_combo);
-       gtk_box_pack_start (GTK_BOX (hbox1), hdr_combo, TRUE, TRUE, 0);
-       gtk_widget_set_usize (hdr_combo, 150 /* 96 */, -1);
-       gtkut_combo_set_items (GTK_COMBO (hdr_combo),
-                              "From", "To", "Subject", "Date", NULL);
-
-/*     key_check = gtk_check_button_new_with_label(_("Show")); */
-/*     gtk_widget_show (key_check); */
-/*     gtk_box_pack_start (GTK_BOX (hbox1), key_check, FALSE, FALSE, 0); */
-/*     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_check), 1); */
-
-       /* register / substitute / delete */
-
-       reg_hbox = gtk_hbox_new (FALSE, 4);
-       gtk_widget_show (reg_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox,
-                           FALSE, FALSE, 0);
-
-       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_show (arrow);
-       gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize (arrow, -1, 16);
-
-       btn_hbox = gtk_hbox_new (TRUE, 4);
-       gtk_widget_show (btn_hbox);
-       gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
-
-       /*
-       reg_btn = gtk_button_new_with_label (_("Add"));
-       gtk_widget_show (reg_btn);
-       gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
-                           GTK_SIGNAL_FUNC
-                           (prefs_display_headers_register_cb), NULL);
-       */
-
-       /*
-       subst_btn = gtk_button_new_with_label (_(" Substitute "));
-       gtk_widget_show (subst_btn);
-       gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
-                           GTK_SIGNAL_FUNC
-                           (prefs_display_headers_substitute_cb),
-                           NULL);
-       */
-
-       ch_hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (ch_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox1), ch_hbox,
-                           TRUE, TRUE, 0);
-
-       ch_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_set_usize (ch_scrolledwin, 230, 200);
-       gtk_widget_show (ch_scrolledwin);
-       gtk_box_pack_start (GTK_BOX (ch_hbox), ch_scrolledwin,
-                           TRUE, TRUE, 0);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ch_scrolledwin),
-                                       GTK_POLICY_AUTOMATIC,
-                                       GTK_POLICY_AUTOMATIC);
-
-       title[0] = _("Headers order");
-       headers_clist = gtk_clist_new_with_titles(1, title);
-       gtk_widget_show (headers_clist);
-       gtk_container_add (GTK_CONTAINER (ch_scrolledwin), headers_clist);
-       gtk_clist_set_column_width (GTK_CLIST (headers_clist), 0, 150);
-       /* gtk_clist_set_column_width (GTK_CLIST (headers_clist), 1, 50); */
-       gtk_clist_set_selection_mode (GTK_CLIST (headers_clist),
-                                     GTK_SELECTION_BROWSE);
-       gtk_clist_set_reorderable (GTK_CLIST (headers_clist), TRUE);
-       gtk_clist_set_use_drag_icons (GTK_CLIST (headers_clist), FALSE);
-       GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (headers_clist)->column[0].button,
-                               GTK_CAN_FOCUS);
-       gtk_signal_connect (GTK_OBJECT (headers_clist), "select_row",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_select),
-                           NULL);
-
-
-       btn_vbox = gtk_vbox_new (FALSE, 8);
-       gtk_widget_show (btn_vbox);
-       gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
-
-       reg_btn = gtk_button_new_with_label (_("Add"));
-       gtk_widget_show (reg_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
-                           GTK_SIGNAL_FUNC
-                           (prefs_display_headers_register_cb),
-                           (void *) FALSE);
-       del_btn = gtk_button_new_with_label (_("Delete"));
-       gtk_widget_show (del_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_delete_cb),
-                           (void *) headers_clist);
-
-       up_btn = gtk_button_new_with_label (_("Up"));
-       gtk_widget_show (up_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_up), NULL);
-
-       down_btn = gtk_button_new_with_label (_("Down"));
-       gtk_widget_show (down_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_down), NULL);
-
-       /* hidden headers list */
-
-       ch_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_set_usize (ch_scrolledwin, 230, 200);
-       gtk_widget_show (ch_scrolledwin);
-       gtk_box_pack_start (GTK_BOX (ch_hbox), ch_scrolledwin,
-                           TRUE, TRUE, 0);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ch_scrolledwin),
-                                       GTK_POLICY_AUTOMATIC,
-                                       GTK_POLICY_AUTOMATIC);
-
-       title[0] = _("Hidden headers");
-       hidden_headers_clist = gtk_clist_new_with_titles(1, title);
-       gtk_widget_show (hidden_headers_clist);
-       gtk_container_add (GTK_CONTAINER (ch_scrolledwin),
-                          hidden_headers_clist);
-       gtk_clist_set_column_width (GTK_CLIST (hidden_headers_clist), 0, 150);
-       gtk_clist_set_selection_mode (GTK_CLIST (hidden_headers_clist),
-                                     GTK_SELECTION_BROWSE);
-       gtk_clist_set_auto_sort(GTK_CLIST (hidden_headers_clist), TRUE);
-       GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (hidden_headers_clist)->
-                               column[0].button, GTK_CAN_FOCUS);
-       gtk_signal_connect (GTK_OBJECT (hidden_headers_clist), "select_row",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_select),
-                           NULL);
-
-       /* end of hidden headers list */
-
-       btn_vbox = gtk_vbox_new (FALSE, 8);
-       gtk_widget_show (btn_vbox);
-       gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
-
-       reg_btn = gtk_button_new_with_label (_("Add"));
-       gtk_widget_show (reg_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
-                           GTK_SIGNAL_FUNC
-                           (prefs_display_headers_register_cb),
-                           (void *) TRUE);
-       del_btn = gtk_button_new_with_label (_("Delete"));
-       gtk_widget_show (del_btn);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_display_headers_delete_cb),
-                           (void *) hidden_headers_clist);
-
-       PACK_CHECK_BUTTON (vbox1, checkbtn_other_headers,
-                          _("Show other headers"));
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_other_headers),
-                                    1);
-
-       gtk_signal_connect
-               (GTK_OBJECT (checkbtn_other_headers), "toggled",
-                GTK_SIGNAL_FUNC (prefs_display_headers_other_headers_toggled),
-                NULL);
-
-       gtk_widget_show_all(window);
-
-       headers.window        = window;
-       headers.ok_btn        = ok_btn;
-       headers.cancel_btn    = cancel_btn;
-
-       headers.hdr_combo     = hdr_combo;
-       headers.hdr_entry     = GTK_COMBO (hdr_combo)->entry;
-/*     headers.key_check     = key_check; */
-       headers.headers_clist = headers_clist;
-       headers.hidden_headers_clist = hidden_headers_clist;
-
-       headers.other_headers = checkbtn_other_headers;
-}
-
-void prefs_display_headers_read_config(void)
-{
-       gchar *rcpath;
-       FILE *fp;
-       gchar buf[PREFSBUFSIZE];
-       HeaderDisplayProp *dp;
-
-       debug_print(_("Reading configuration for displaying of headers...\n"));
-
-       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                            HEADERS_DISPLAY_RC, NULL);
-       if ((fp = fopen(rcpath, "r")) == NULL) {
-               if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
-               g_free(rcpath);
-               prefs_display_headers.headers_list = NULL;
-               prefs_display_headers_set_default();
-               return;
-       }
-       g_free(rcpath);
-
-       /* remove all previous headers list */
-       while (prefs_display_headers.headers_list != NULL) {
-               dp = (HeaderDisplayProp *)
-                       prefs_display_headers.headers_list->data;
-               header_display_prop_free(dp);
-               prefs_display_headers.headers_list =
-                       g_slist_remove(prefs_display_headers.headers_list, dp);
-       }
-
-       prefs_display_headers.show_other_headers = 1;
- 
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               g_strchomp(buf);
-               if (strcmp(buf, "-") == 0)
-                       prefs_display_headers.show_other_headers = 0;
-               else {
-                       dp = header_display_prop_read_str(buf);
-                       if (dp)
-                               prefs_display_headers.headers_list =
-                                       g_slist_append(prefs_display_headers.headers_list, dp);
-               }
-       }
- 
-       fclose(fp);
-}
-
-void prefs_display_headers_write_config(void)
-{
-       gchar *rcpath;
-       PrefFile *pfile;
-       GSList *cur;
-/*     gchar buf[PREFSBUFSIZE]; */
-/*     FILE *fp; */
-/*     HeaderDisplayProp *dp; */
-
-       debug_print(_("Writing configuration for displaying of headers...\n"));
-
-       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                            HEADERS_DISPLAY_RC, NULL);
-
-       if ((pfile = prefs_write_open(rcpath)) == NULL) {
-               g_warning(_("failed to write configuration to file\n"));
-               g_free(rcpath);
-               return;
-       }
-
-       for (cur = prefs_display_headers.headers_list; cur != NULL;
-            cur = cur->next) {
-               HeaderDisplayProp *hdr = (HeaderDisplayProp *)cur->data;
-               gchar *dpstr;
-
-               dpstr = header_display_prop_get_str(hdr);
-               if (fputs(dpstr, pfile->fp) == EOF ||
-                   fputc('\n', pfile->fp) == EOF) {
-                       FILE_OP_ERROR(rcpath, "fputs || fputc");
-                       prefs_write_close_revert(pfile);
-                       g_free(rcpath);
-                       g_free(dpstr);
-                       return;
-               }
-               g_free(dpstr);
-       }
-
-       if (!prefs_display_headers.show_other_headers) {
-               if (fputs("-\n", pfile->fp) == EOF) {
-                       FILE_OP_ERROR(rcpath, "fputs");
-                       prefs_write_close_revert(pfile);
-                       g_free(rcpath);
-                       return;
-               }
-       }
-
-       g_free(rcpath);
-
-       if (prefs_write_close(pfile) < 0) {
-               g_warning(_("failed to write configuration to file\n"));
-               return;
-       }
-}
-
-static void prefs_display_headers_set_dialog()
-{
-       GtkCList * clist = GTK_CLIST(headers.headers_clist);
-       GtkCList * hidden_clist = GTK_CLIST(headers.hidden_headers_clist);
-       GSList *cur;
-       gchar *dp_str[1];
-       gint row;
-
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
-
-       gtk_clist_freeze(hidden_clist);
-       gtk_clist_clear(hidden_clist);
-
-/*     dp_str[0] = _("(New)"); */
-
-/*     row = gtk_clist_append(clist, dp_str); */
-/*     gtk_clist_set_row_data(clist, row, NULL); */
-
-/*     row = gtk_clist_append(hidden_clist, dp_str); */
-/*     gtk_clist_set_row_data(hidden_clist, row, NULL); */
-
-       for (cur = prefs_display_headers.headers_list; cur != NULL;
-            cur = cur->next) {
-               HeaderDisplayProp *dp = (HeaderDisplayProp *)cur->data;
-
-               dp_str[0] = dp->name;
-               /* dp_str[1] = dp->hidden ? _("Hide") : _("Show"); */
-
-               if (dp->hidden) {
-                       row = gtk_clist_append(hidden_clist, dp_str);
-                       gtk_clist_set_row_data(hidden_clist, row, dp);
-               }
-               else {
-                       row = gtk_clist_append(clist, dp_str);
-                       gtk_clist_set_row_data(clist, row, dp);
-               }
-       }
-
-       gtk_clist_thaw(hidden_clist);
-       gtk_clist_thaw(clist);
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(headers.other_headers), prefs_display_headers.show_other_headers);
-}
-
-static void prefs_display_headers_set_list()
-{
-       gint row;
-       HeaderDisplayProp *dp;
-
-       g_slist_free(prefs_display_headers.headers_list);
-       prefs_display_headers.headers_list = NULL;
-
-       row = 0;
-       while ((dp = gtk_clist_get_row_data(GTK_CLIST(headers.headers_clist),
-               row)) != NULL) {
-               prefs_display_headers.headers_list =
-                       g_slist_append(prefs_display_headers.headers_list, dp);
-               row++;
-       }
-
-       row = 0;
-       while ((dp = gtk_clist_get_row_data(GTK_CLIST(headers.hidden_headers_clist), row)) != NULL) {
-               prefs_display_headers.headers_list =
-                       g_slist_append(prefs_display_headers.headers_list, dp);
-               row++;
-       }
-}
-
-/**
- * prefs_display_headers_find_header:
- * @clist: List of headers.
- * @header: Header name.
- * 
- * Find row of @clist which contains @header.
- * 
- * Return value: Row index, or -1 if not found.
- **/
-static gint prefs_display_headers_find_header(GtkCList *clist,
-                                             const gchar *header)
-{
-       gint row;
-       HeaderDisplayProp *dp;
-
-       row = 0;
-       while ((dp = gtk_clist_get_row_data(clist, row)) != NULL) {
-               if (g_strcasecmp(dp->name, header) == 0)
-                       return row;
-               row++;
-       }
-       return -1;
-}
-
-#define GET_ENTRY(entry) \
-       entry_text = gtk_entry_get_text(GTK_ENTRY(entry))
-
-static gint prefs_display_headers_clist_set_row(gboolean hidden)
-{
-       GtkCList *clist;
-       HeaderDisplayProp *dp;
-       gchar *entry_text;
-       gchar *dp_str[1];
-       gint row;
-
-       GET_ENTRY(headers.hdr_entry);
-       if (entry_text[0] == '\0') {
-               alertpanel_error(_("Header name is not set."));
-               return -1;
-       }
-
-       if (hidden)
-               clist = GTK_CLIST(headers.hidden_headers_clist);
-       else
-               clist = GTK_CLIST(headers.headers_clist);
-
-       if (prefs_display_headers_find_header(clist, entry_text) != -1) {
-               alertpanel_error(_("This header is already in the list."));
-               return -1;
-       }
-
-       dp = g_new0(HeaderDisplayProp, 1);
-
-       dp->name = g_strdup(entry_text);
-
-       /*
-       dp->hidden = !gtk_toggle_button_get_active
-               (GTK_TOGGLE_BUTTON(headers.key_check));
-       */
-       dp->hidden = hidden;
-
-       dp_str[0] = dp->name;
-
-       row = gtk_clist_append(clist, dp_str);
-       
-       gtk_clist_set_row_data(clist, row, dp);
-       
-       prefs_display_headers_set_list();
-               
-       return row;
-}
-
-static void prefs_display_headers_register_cb(GtkButton *btn,
-                                             void * hidden_data)
-{
-       gboolean hidden = (gboolean) hidden_data;
-
-       prefs_display_headers_clist_set_row(hidden);
-}
-
-/*
-static void prefs_display_headers_substitute_cb(void)
-{
-       GtkCList *clist = GTK_CLIST(headers.headers_clist);
-       HeaderDisplayProp *dp;
-       gint row;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0) return;
-
-       dp = gtk_clist_get_row_data(clist, row);
-       if (!dp) return;
-
-       prefs_display_headers_clist_set_row(row);
-}
-*/
-
-static void prefs_display_headers_delete_cb(GtkButton *btn, void * clist_data)
-{
-       //      GtkCList *clist = GTK_CLIST(headers.headers_clist);     
-       GtkCList *clist = GTK_CLIST(clist_data);
-       HeaderDisplayProp *dp;
-       gint row;
-
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-/*     if (row == 0) return; */
-
-       if (alertpanel(_("Delete header"),
-                      _("Do you really want to delete this header?"),
-                      _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
-               return;
-
-       dp = gtk_clist_get_row_data(clist, row);
-       header_display_prop_free(dp);
-       gtk_clist_remove(clist, row);
-       prefs_display_headers.headers_list =
-               g_slist_remove(prefs_display_headers.headers_list, dp);
-}
-
-static void prefs_display_headers_up(void)
-{
-       GtkCList *clist = GTK_CLIST(headers.headers_clist);
-       gint row;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 0) {
-               gtk_clist_row_move(clist, row, row - 1);
-               prefs_display_headers_set_list();
-       }
-}
-
-static void prefs_display_headers_down(void)
-{
-       GtkCList *clist = GTK_CLIST(headers.headers_clist);
-       gint row;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row >= 0 && row < clist->rows - 1) {
-               gtk_clist_row_move(clist, row, row + 1);
-               prefs_display_headers_set_list();
-       }
-}
-
-static void prefs_display_headers_select(GtkCList *clist, gint row,
-                                        gint column, GdkEvent *event)
-{
-       HeaderDisplayProp *dp;
-       HeaderDisplayProp default_dp = { "", 0 };
-
-       dp = gtk_clist_get_row_data(clist, row);
-       if (!dp)
-               dp = &default_dp;
-
-       ENTRY_SET_TEXT(headers.hdr_entry, "");
-
-       /*      ENTRY_SET_TEXT(headers.hdr_entry, dp->name);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(headers.key_check),
-       !dp->hidden);*/
-
-       /*
-       if ((row != 0) && event && (event->type == GDK_2BUTTON_PRESS)) {
-               gtk_toggle_button_set_active
-                       (GTK_TOGGLE_BUTTON(headers.key_check), dp->hidden);
-               prefs_display_headers_clist_set_row(row);
-       }
-       */
-}
-
-static void prefs_display_headers_key_pressed(GtkWidget *widget,
-                                             GdkEventKey *event,
-                                             gpointer data)
-{
-       if (event && event->keyval == GDK_Escape)
-               gtk_widget_hide(headers.window);
-}
-
-static void prefs_display_headers_ok(GtkButton *button)
-{
-       prefs_display_headers_write_config();
-       gtk_widget_hide(headers.window);
-}
-
-static void prefs_display_headers_cancel(GtkButton *button)
-{
-       prefs_display_headers_read_config();
-       gtk_widget_hide(headers.window);
-}
-
-static void prefs_display_headers_other_headers_toggled(void)
-{
-       prefs_display_headers.show_other_headers = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(headers.other_headers));
-}

diff --git a/src/prefs_display_headers.h b/src/prefs_display_headers.h
deleted file mode 100644 (file)
index 7f031c8..0000000
--- a/src/prefs_display_headers.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PREFS_DISPLAY_HEADERS_H__
-#define __PREFS_DISPLAY_HEADERS_H__
-
-void prefs_display_headers_read_config (void);
-void prefs_display_headers_write_config        (void);
-void prefs_display_headers_open         (void);
-
-struct _PrefsDisplayHeaders {
-       gboolean show_other_headers;
-       GSList * headers_list;
-};
-
-typedef struct _PrefsDisplayHeaders PrefsDisplayHeaders;
-
-extern PrefsDisplayHeaders prefs_display_headers;
-
-
-#endif /* __PREFS_DISPLAY_HEADERS_H__ */