sync with 0.9.12cvs26 HEAD

diff --git a/ChangeLog b/ChangeLog
index f10a5a14b8ea22655c73586a6fc54cf799640ded..b2b450b23c4268ea0ea4b5b71ddecd553a32367f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-07-16
+
+       * src/pop.[ch]: pop3_getrange_uidl_recv(): relaxed invalid UIDL
+         checking.
+
+2004-07-16
+
+       * src/account.[ch]
+         src/main.c
+         src/prefs.[ch]
+         src/prefs_account.[ch]
+         src/prefs_common.[ch]: unified *_{save,write}_config() to
+         *_write_config().
+
+2004-06-30
+
+       * src/procheader.c:
+         procheader_get_one_field()
+         procheader_get_unfolded_line(): fixed a bug that unfolding was
+         broken if the sequence 'SP CR LF' appeared (thanks to NOGUCHI,
+         Takuya).
+
 2004-06-23
 
        * src/prefs_common.c: made the default of confirm_on_exit FALSE.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 92850e31a5d07b74a8fe7633d62eec8636024191..94f8cde017476b0bfce0ca47279c22b999ab4484 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,26 @@
+2004-07-16 [paul]      0.9.12cvs26.1
+       
+       * src/gtk/quicksearch.c
+       * src/account.c
+       * src/account.h
+       * src/compose.c
+       * src/customheader.c
+       * src/folder_item_prefs.c
+       * src/main.c
+       * src/messageview.c
+       * src/news.c
+       * src/pop.c
+       * src/pop.h
+       * src/prefs_account.c
+       * src/prefs_account.h
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_display_header.c
+       * src/prefs_gtk.c
+       * src/prefs_gtk.h
+       * src/procheader.c
+               sync with 0.9.12cvs26 HEAD      
+
 2004-07-15 [colin]     0.9.12cvs18.14
 
        * src/folder.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index aff1017e7c5f9485ad8afa5b24d44a25598cd51a..82f22f4a7791c44d0a56ff1d9a042a1cbd835436 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,91 @@
+2004-07-16 [paul]      0.9.12cvs26
+       
+       * src/gtk/quicksearch.c
+       * src/compose.c
+       * src/customheader.c
+       * src/messageview.c
+       * src/news.c
+       * src/prefs_account.c
+       * src/prefs_display_header.c
+       * src/procheader.c
+               replace "Message-Id" with "Message-ID"
+
+2004-07-16 [paul]      0.9.12cvs25
+
+       * ChangeLog
+       * ChangeLog.jp
+       * src/account.c
+       * src/account.h
+       * src/folder_item_prefs.c
+       * src/main.c
+       * src/pop.c
+       * src/pop.h
+       * src/prefs_account.c
+       * src/prefs_account.h
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_gtk.c
+       * src/prefs_gtk.h
+               sync with main 0.9.12cvs1
+
+2004-07-15 [colin]     0.9.12cvs24
+
+       * src/folder.c
+               Disable GPG signature check during
+               folder move and scan 
+       (Closes Bug 521 Signature checking slows down Folder-Move)
+
+2004-07-14 [christoph] 0.9.12cvs23
+
+       * src/pgpmime.c
+               add missing fclose
+
+       * src/procmime.c
+               add checks if fopen really worked
+
+2004-07-14 [colin]     0.9.12cvs22
+
+       * src/pop.c
+       * src/common/partial_download.c
+               Update includes
+
+2004-07-14 [colin]     0.9.12cvs21
+
+       * src/folder.c
+       * src/inc.c
+       * src/matcher.c
+       * src/matcher.h
+       * src/matcher_parser_parse.y
+       * src/messageview.c
+       * src/msgcache.c
+       * src/noticeview.c
+       * src/noticeview.h
+       * src/pop.c
+       * src/pop.h
+       * src/prefs_matcher.c
+       * src/procheader.c
+       * src/procmsg.c
+       * src/procmsg.h
+       * src/summaryview.c
+       * src/common/Makefile.am
+       * src/common/defs.h
+       * src/gtk/quicksearch.c
+       * src/common/partial_download.c ** NEW FILES **
+       * src/common/partial_download.h ** NEW FILES **
+               Partial downloading of pop3 mails
+
+2004-07-13 [christoph] 0.9.12cvs20
+
+       * src/mimeview.c
+               use "button_release_event" instead of "button_press_event",
+               because executing event callbacks while the button is still
+               pressed is not good and causes problems
+
+2004-07-12 [colin]     0.9.12cvs19
+
+       * src/gtk/quicksearch.c
+               Fix a missing status update in quicksearch
+
 2004-07-08 [colin]     0.9.12cvs18
 
        * src/common/smtp.h
@@ -39,6 +127,9 @@
                enable next unread button in empty folders if next folder
                dialog is not disabled
 
+       (Closes Feature Request [ 755800 ] "next" button enabled in empty
+        folders)
+
 2004-07-06 [colin]     0.9.12cvs12
 
        * src/common/smtp.c [1.16]

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c7c74a704dfd82cf0e5325d0906e67f686771c10..ebd361e032e90191351346a39d0e27049ec254f0 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,25 @@
+2004-07-16
+
+       * src/pop.[ch]: pop3_getrange_uidl_recv(): ̵¸ú¤Ê UIDL ¤Î¥Á¥§¥Ã¥¯¤ò
+         ´Ë¤á¤¿¡£
+
+2004-07-16
+
+       * src/account.[ch]
+         src/main.c
+         src/prefs.[ch]
+         src/prefs_account.[ch]
+         src/prefs_common.[ch]: *_{save,write}_config() ¤ò *_write_config()
+         ¤ËÅý°ì¡£
+
+2004-06-30
+
+       * src/procheader.c:
+         procheader_get_one_field()
+         procheader_get_unfolded_line(): ¥·¡¼¥±¥ó¥¹ 'SP CR LF' ¤¬½Ð¸½
+         ¤·¤¿¤È¤­¤ËÀÞ¤êÊÖ¤·²ò½ü½èÍý¤¬Àµ¤·¤¯Æ°ºî¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ
+         (NOGUCHI, Takuya ¤µ¤ó thanks)¡£
+
 2004-06-23
 
        * src/prefs_common.c: confirm_on_exit ¤Î¥Ç¥Õ¥©¥ë¥È¤ò FALSE ¤Ë¤·¤¿¡£

diff --git a/configure.ac b/configure.ac
index f8f471d1690446d58fd61aa1b234a78f16f500f2..483167bd292f81affd3d78260f73cb1c0353714f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=26
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.14
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/account.c b/src/account.c
index aa57b27c650c4d9cb9304eac536654c561fe5d4b..55184df9b94a111bbc1b1a35bfbb00cf2855f09a 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
@@ -169,9 +169,9 @@ void account_read_config_all(void)
        }
 }
 
-void account_save_config_all(void)
+void account_write_config_all(void)
 {
-       prefs_account_save_config_all(account_list);
+       prefs_account_write_config_all(account_list);
 }
 
 /*
@@ -383,7 +383,7 @@ void account_open(PrefsAccount *ac_prefs)
                folderview_set_all();
        }
 
-       account_save_config_all();
+       account_write_config_all();
        account_set_menu();
        main_window_reflect_prefs_all();
 }
@@ -971,7 +971,7 @@ static void account_set_default(void)
 static void account_edit_close(void)
 {
        account_list_set();
-       account_save_config_all();
+       account_write_config_all();
 
        if (!cur_account && account_list) {
                PrefsAccount *ac_prefs = (PrefsAccount *)account_list->data;

diff --git a/src/account.h b/src/account.h
index a54e5fd9b9cec657a94647caac4e40d1ddc0b356..230a003d50f2c8b883c376b35306b6510379cc8e 100644 (file)
--- a/src/account.h
+++ b/src/account.h
@@ -32,7 +32,7 @@ typedef gint  (*AccountFunc)  (PrefsAccount   *ac_prefs,
 extern PrefsAccount *cur_account;
 
 void         account_read_config_all   (void);
-void         account_save_config_all   (void);
+void         account_write_config_all  (void);
 
 GList        *account_find_all_from_address    (GList          *ac_list,
                                                 const gchar    *address);

diff --git a/src/compose.c b/src/compose.c
index 6ef9be64a31eb0f41c2ceaca5be3cb5228422b67..8def5a210cd8201e73ddd728ba0676443208d488 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3432,7 +3432,7 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
        /* Resent-Message-ID */
        if (compose->account->gen_msgid) {
                compose_generate_msgid(buf, sizeof(buf));
-               fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
+               fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
 
@@ -4403,7 +4403,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
        /* Message-ID */
        if (compose->account->gen_msgid) {
                compose_generate_msgid(buf, sizeof(buf));
-               fprintf(fp, "Message-Id: <%s>\n", buf);
+               fprintf(fp, "Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
 

diff --git a/src/customheader.c b/src/customheader.c
index 6bdfd9ee631dab2fa9e6b08faa21cf07a0637e73..803d62deae9cbc0375dd87eeb1b03c981dc94047 100644 (file)
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -107,7 +107,7 @@ gboolean custom_header_is_allowed(const gchar *header)
            strcasecmp(header, "From")         != 0 &&
            strcasecmp(header, "To")           != 0 &&
         /* strcasecmp(header, "Sender")       != 0 && */
-           strcasecmp(header, "Message-Id")   != 0 &&
+           strcasecmp(header, "Message-ID")   != 0 &&
            strcasecmp(header, "In-Reply-To")  != 0 &&
            strcasecmp(header, "References")   != 0 &&
            strcasecmp(header, "Mime-Version") != 0 &&

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 2af89906514cf0c8f2e6b85337683ece42757ee7..9d99647afc824ed3c9e989e9564dcd089c67f1b7 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -142,7 +142,7 @@ void folder_item_prefs_save_config(FolderItem * item)
 
        id = folder_item_get_identifier(item);
 
-       prefs_save_config(param, id, FOLDERITEM_RC);
+       prefs_write_config(param, id, FOLDERITEM_RC);
        g_free(id);
 
        /* MIGRATION: make sure migrated items are not saved

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 643c04e31bf11ef7ce6563a9a6b16282993c0377..26a9037b829a8ce3a461dc680c4d9611a3a3591a 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -176,7 +176,7 @@ static gchar *search_descr_strings[] = {
        "f S",   N_("messages originating from user S"),
        "F",     N_("forwarded messages"),
        "h S",   N_("messages which contain header S"),
-       "i S",   N_("messages which contain S in Message-Id header"),
+       "i S",   N_("messages which contain S in Message-ID header"),
        "I S",   N_("messages which contain S in inreplyto header"),
        "L",     N_("locked messages"),
        "n S",   N_("messages which are in newsgroup S"),
@@ -475,7 +475,7 @@ gchar *expand_search_string(const gchar *search_string)
                { "f",  "from",                         1,      TRUE,   TRUE  },
                { "F",  "forwarded",                    0,      FALSE,  FALSE },
                { "h",  "headers_part",                 1,      TRUE,   TRUE  },
-               { "i",  "header \"Message-Id\"",        1,      TRUE,   TRUE  },
+               { "i",  "header \"Message-ID\"",        1,      TRUE,   TRUE  },
                { "I",  "inreplyto",                    1,      TRUE,   TRUE  },
                { "L",  "locked",                       0,      FALSE,  FALSE },
                { "n",  "newsgroups",                   1,      TRUE,   TRUE  },

diff --git a/src/main.c b/src/main.c
index 15395538ddd5bde251285fe41c1e0b5e6372e70f..4429a24e19a189e74fc3c52228f3d57f0778368d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
@@ -410,8 +410,8 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
-       prefs_common_save_config();
-       account_save_config_all();
+       prefs_common_write_config();
+       account_write_config_all();
        addressbook_export_to_file();
 
        filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 63a21438e9ea9e7b4b32d70f1483c29428edb32e..946f6a0b68d90b02a4cd2ae461b3c0be0734074d 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1479,7 +1479,7 @@ void main_window_get_size(MainWindow *mainwin)
                prefs_common.msgview_height = allocation->height;
        }
 
-       debug_print("summaryview size: %d x %d\n",
+/*     debug_print("summaryview size: %d x %d\n",
                    prefs_common.summaryview_width,
                    prefs_common.summaryview_height);
        debug_print("folderview size: %d x %d\n",
@@ -1487,7 +1487,7 @@ void main_window_get_size(MainWindow *mainwin)
                    prefs_common.folderview_height);
        debug_print("messageview size: %d x %d\n",
                    prefs_common.msgview_width,
-                   prefs_common.msgview_height);
+                   prefs_common.msgview_height); */
 }
 
 void main_window_get_position(MainWindow *mainwin)

diff --git a/src/messageview.c b/src/messageview.c
index 4a9731a02f2c0f600a0463b33157699baa471cc5..b27acc9cf357b12311638924fba38d418f583a14 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -627,7 +627,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
        /* Message ID */
        generate_msgid(account->address, buf, sizeof buf);
-       fprintf(fp, "Message-Id: <%s>\n", buf);
+       fprintf(fp, "Message-ID: <%s>\n", buf);
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");

diff --git a/src/mimeview.c b/src/mimeview.c
index 130b2a57c8ad2db0a53541e1e1ee54fb28747306..3354c827bb559e466ee6df5263e459234404d4e5 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -219,7 +219,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
                         G_CALLBACK(mimeview_selected), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(mimeview_button_pressed), mimeview);
        g_signal_connect(G_OBJECT(ctree), "key_press_event",
                         G_CALLBACK(mimeview_key_pressed), mimeview);
@@ -1336,7 +1336,7 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
                        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
                                                     TRUE);
        } else {
-               g_signal_stop_emission_by_name(G_OBJECT(button), "button_press_event");
+               g_signal_stop_emission_by_name(G_OBJECT(button), "button_release_event");
        }
 
        part_button_pressed(mimeview, event, partinfo);
@@ -1589,7 +1589,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
        g_free(tip);
        gtk_widget_show_all(button);
-       g_signal_connect(G_OBJECT(button), "button_press_event", 
+       g_signal_connect(G_OBJECT(button), "button_release_event", 
                         G_CALLBACK(icon_clicked_cb), mimeview);
        g_signal_connect(G_OBJECT(button), "key_press_event", 
                         G_CALLBACK(icon_key_pressed), mimeview);

diff --git a/src/news.c b/src/news.c
index cddc540e501c4be72416fc2195b1af8e1a38e355..b7bf280ca3ed006e6641fe556a3dd168e7808241 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -537,7 +537,7 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
        if (ok != NN_SUCCESS)
                return ok;
 
-       debug_print("Message-Id = %s, num = %d\n", msgid, num);
+       debug_print("Message-ID = %s, num = %d\n", msgid, num);
        g_free(msgid);
 
        ok = recv_write_to_file(SESSION(session)->sock, filename);

diff --git a/src/pgpmime.c b/src/pgpmime.c
index cb95e84b10ab4609ceba33687c10c019ebb2bb8c..fe0793daac9f98e41eadc38dc7c0d607632cba5a 100644 (file)
--- a/src/pgpmime.c
+++ b/src/pgpmime.c
@@ -172,6 +172,7 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
        gpgme_data_release(sigdata);
        gpgme_data_release(textdata);
        g_string_free(textstr, TRUE);
+       fclose(fp);
        
        return 0;
 }

diff --git a/src/pop.c b/src/pop.c
index ebcf4c23faf2dda3936d911e81726e9c17db7608..217fcf5554e813b5e129fcc77739c73702c70640 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -251,10 +251,11 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                p = newline + 1;
                if (p < lastp && *p == '\n') p++;
 
-               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2)
-                       return -1;
-               if (num <= 0 || num > session->count)
-                       return -1;
+               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2 ||
+                   num <= 0 || num > session->count) {
+                       log_warning(_("invalid UIDL response: %s\n"), buf);
+                       continue;
+               }
 
                session->msg[num].uidl = g_strdup(id);
 

diff --git a/src/pop.h b/src/pop.h
index b8ffd2326dcf93498033f657e15ac467a3e352c3..8b4d9b1f596855566ed0d835c60f84d47f96b909 100644 (file)
--- a/src/pop.h
+++ b/src/pop.h
@@ -149,8 +149,8 @@ struct _Pop3Session
 };
 
 #define POPBUFSIZE     512
-#define IDLEN          128
-
+/* #define IDLEN       128 */
+#define IDLEN          POPBUFSIZE
 
 Session *pop3_session_new      (PrefsAccount   *account);
 void pop3_get_uidl_table       (PrefsAccount   *account, Pop3Session *session);

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 7706ce41b4dc07a0925988f2d23b7e37e9032fc4..593ab093deb09b102505d89b0c541e76a0ee0bce 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -597,7 +597,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        prefs_custom_header_read_config(ac_prefs);
 }
 
-void prefs_account_save_config_all(GList *account_list)
+void prefs_account_write_config_all(GList *account_list)
 {
        GList *cur;
        gchar *rcpath;
@@ -1361,7 +1361,7 @@ static void prefs_account_send_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
        PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date"));
-       PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-Id"));
+       PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
 
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 5b2e4a771648e9fc1561c85270664fef2e75830d..ec69975a05cabb4798d01f1f57691f7fed8270c7 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
@@ -199,7 +199,7 @@ PrefsAccount *prefs_account_new             (void);
 
 void prefs_account_read_config         (PrefsAccount   *ac_prefs,
                                         const gchar    *label);
-void prefs_account_save_config_all     (GList          *account_list);
+void prefs_account_write_config_all    (GList          *account_list);
 
 void prefs_account_free                        (PrefsAccount   *ac_prefs);
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 6f35975f99dde8be8b116c48f0634cd5392ed25d..9a9aeacbeb2dfd9a2ddd2afe716641017be8f31f 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -890,9 +890,9 @@ void prefs_common_save_history(const gchar *history, GList *list)
        g_free(path);
 }
 
-void prefs_common_save_config(void)
+void prefs_common_write_config(void)
 {
-       prefs_save_config(param, "Common", COMMON_RC);
+       prefs_write_config(param, "Common", COMMON_RC);
 
        prefs_common_save_history(COMMAND_HISTORY, 
                prefs_common.mime_open_cmd_history);
@@ -3108,7 +3108,7 @@ static void prefs_common_apply(void)
        prefs_set_data_from_dialog(param);
        sock_set_io_timeout(prefs_common.io_timeout_secs);
        main_window_reflect_prefs_all_real(FALSE);
-       prefs_common_save_config();
+       prefs_common_write_config();
 
        mainwindow = mainwindow_get_mainwindow();
        log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 7b31bfea3f3e3ea7b57694b08e99f53e71e211c6..b48a2a0a7cd1d974f807f02c73c62361694f26b3 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -310,7 +310,7 @@ extern PrefsCommon prefs_common;
 
 void prefs_common_init         (void);
 void prefs_common_read_config  (void);
-void prefs_common_save_config  (void);
+void prefs_common_write_config (void);
 void prefs_common_open         (void);
 PrefsCommon *prefs_common_get  (void);
 

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index d87ab65195337b7fde149804393fa2ad3ae3f8c1..fe02a332e851a3b271ecadb9d0153303faba363f 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -101,7 +101,7 @@ static gchar *defaults[] =
        "X-Newsreader",
        "User-Agent",
        "-Received",
-       "-Message-Id",
+       "-Message-ID",
        "-In-Reply-To",
        "-References",
        "-Mime-Version",

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index c0f64f584d7bd4b447e6dd6521e37e72952b41eb..3486c2a17b9aa0ef98b3a1ff668b9df86ad4c821 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -190,8 +190,8 @@ if (!(func)) \
        return; \
 } \
 
-void prefs_save_config(PrefParam *param, const gchar *label,
-                      const gchar *rcfile)
+void prefs_write_config(PrefParam *param, const gchar *label,
+                       const gchar *rcfile)
 {
        FILE *orig_fp;
        PrefFile *pfile;

diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h
index 675c693fbbb33f6c05262c58610dcad92bd733b6..f4e9e89087f69402338b5ccc16b5a86477e50ab4 100644 (file)
--- a/src/prefs_gtk.h
+++ b/src/prefs_gtk.h
@@ -138,7 +138,7 @@ void prefs_read_config              (PrefParam      *param,
                                 const gchar    *rcfile);
 void prefs_config_parse_one_line(PrefParam     *param,
                                 const gchar    *buf);
-void prefs_save_config         (PrefParam      *param,
+void prefs_write_config                (PrefParam      *param,
                                 const gchar    *label,
                                 const gchar    *rcfile);
 gint prefs_write_param         (PrefParam      *param,

diff --git a/src/procheader.c b/src/procheader.c
index c6377caaa71b61482fb26f40ada071f3048eaa31..030152526473f760a0490dc294be72c35fcd06eb 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -516,7 +516,7 @@ static HeaderEntry hentry_full[] = {{"Date:",               NULL, FALSE},
                                   {"Cc:",              NULL, TRUE},
                                   {"Newsgroups:",      NULL, TRUE},
                                   {"Subject:",         NULL, TRUE},
-                                  {"Message-Id:",      NULL, FALSE},
+                                  {"Message-ID:",      NULL, FALSE},
                                   {"References:",      NULL, FALSE},
                                   {"In-Reply-To:",     NULL, FALSE},
                                   {"Content-Type:",    NULL, FALSE},
@@ -540,7 +540,7 @@ static HeaderEntry hentry_short[] = {{"Date:",              NULL, FALSE},
                                    {"Cc:",             NULL, TRUE},
                                    {"Newsgroups:",     NULL, TRUE},
                                    {"Subject:",        NULL, TRUE},
-                                   {"Message-Id:",     NULL, FALSE},
+                                   {"Message-ID:",     NULL, FALSE},
                                    {"References:",     NULL, FALSE},
                                    {"In-Reply-To:",    NULL, FALSE},
                                    {"Content-Type:",   NULL, FALSE},

diff --git a/src/procmime.c b/src/procmime.c
index 76a07b03124c717b187e6ae3fc2ad222217dcb16..bc7800ac25e87b340a86e87615bd77253076b7ae 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -995,6 +995,10 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                procmime_decode_content(mimeinfo);
 
        fp = fopen(mimeinfo->filename, "rb");
+       if (fp == NULL) {
+               FILE_OP_ERROR(mimeinfo->filename, "fopen");
+               return;
+       }
        fseek(fp, mimeinfo->offset, SEEK_SET);
        procheader_get_header_fields(fp, hentry);
        if (hentry[0].body != NULL)
@@ -1063,6 +1067,10 @@ void procmime_parse_multipart(MimeInfo *mimeinfo)
                procmime_decode_content(mimeinfo);
 
        fp = fopen(mimeinfo->filename, "rb");
+       if (fp == NULL) {
+               FILE_OP_ERROR(mimeinfo->filename, "fopen");
+               return;
+       }
        fseek(fp, mimeinfo->offset, SEEK_SET);
        while ((p = fgets(buf, sizeof(buf), fp)) != NULL) {
                if (ftell(fp) > (mimeinfo->offset + mimeinfo->length))