2005-01-24 [paul] 1.0.0cvs12.1

	* configure.ac
	* src/messageview.c
	* src/mh.c
	* src/common/utils.c
		sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 1be8f65e29f329b00d75a4cbdebc77e1c5479417..48d5b04b7743e6487fff8d6887d28ce1cf46be0d 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-01-24 [paul]      1.0.0cvs12.1
+
+       * configure.ac
+       * src/messageview.c
+       * src/mh.c
+       * src/common/utils.c
+               sync with HEAD
+
 2005-01-24 [colin]     1.0.0cvs11.1
 
        * src/procheader.c

diff --git a/PATCHSETS b/PATCHSETS
index 99d4398ddf7eae810c3dea88b0ce7f685e17cbdf..4a584462d6626bd82c03ddab95169d762f56c247 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -340,3 +340,4 @@
 ( cvs diff -u -r 1.23.2.6 -r 1.23.2.7 src/crash.c; ) > 1.0.0cvs9.1.patchset
 ( cvs diff -u -r 1.207.2.25 -r 1.207.2.26 src/folderview.c; ) > 1.0.0cvs10.1.patchset
 ( cvs diff -u -r 1.47.2.12 -r 1.47.2.13 src/procheader.c; ) > 1.0.0cvs11.1.patchset
+( cvs diff -u -r 1.654.2.375 -r 1.654.2.376 configure.ac; cvs diff -u -r 1.94.2.37 -r 1.94.2.38 src/messageview.c; cvs diff -u -r 1.79.2.5 -r 1.79.2.6 src/mh.c; cvs diff -u -r 1.36.2.20 -r 1.36.2.21 src/common/utils.c; ) > 1.0.0cvs12.1.patchset

diff --git a/configure.ac b/configure.ac
index 688352918146f99e2228911a6f727e3575a46f1f..fb5d80a2b4707cb247b8f1da02ba9665f8786461 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/common/utils.c b/src/common/utils.c
index be25f07b0ef419090ce16586a15e32797d752eec..348a9bac5406c8d30f4e5c51f1c36d219c152d40 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2041,7 +2041,7 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        DIR *dp;
        struct dirent *d;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
 
        prev_dir = g_get_current_dir();
 
@@ -2058,8 +2058,8 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        }
 
        while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0 && first <= fileno && fileno <= last) {
+               file_no = to_number(d->d_name);
+               if (file_no > 0 && first <= file_no && file_no <= last) {
                        if (is_dir_exist(d->d_name))
                                continue;
                        if (unlink(d->d_name) < 0)
@@ -2085,7 +2085,7 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
        DIR *dp;
        struct dirent *d;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
 
        prev_dir = g_get_current_dir();
 
@@ -2102,9 +2102,9 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
        }
 
        while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0 && (g_slist_find(numberlist, GINT_TO_POINTER(fileno)) == NULL)) {
-                       debug_print("removing unwanted file %d from %s\n", fileno, dir);
+               file_no = to_number(d->d_name);
+               if (file_no > 0 && (g_slist_find(numberlist, GINT_TO_POINTER(file_no)) == NULL)) {
+                       debug_print("removing unwanted file %d from %s\n", file_no, dir);
                        if (is_dir_exist(d->d_name))
                                continue;
                        if (unlink(d->d_name) < 0)
@@ -2136,7 +2136,7 @@ gint remove_expired_files(const gchar *dir, guint hours)
        struct dirent *d;
        struct stat s;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
        time_t mtime, now, expire_time;
 
        prev_dir = g_get_current_dir();
@@ -2157,8 +2157,8 @@ gint remove_expired_files(const gchar *dir, guint hours)
        expire_time = hours * 60 * 60;
 
        while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0) {
+               file_no = to_number(d->d_name);
+               if (file_no > 0) {
                        if (stat(d->d_name, &s) < 0) {
                                FILE_OP_ERROR(d->d_name, "stat");
                                continue;

diff --git a/src/messageview.c b/src/messageview.c
index 2d7b3c9ea4ef4cd48706eec1829ed6c4a8342527..b10c53858645aedc89211c1373f48683fd43b6d8 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -735,6 +735,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        if (messageview->msginfo != msginfo) {
                procmsg_msginfo_free(messageview->msginfo);
                messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
+               if (!messageview->msginfo)
+                       messageview->msginfo = procmsg_msginfo_copy(msginfo);
        }
        headerview_show(messageview->headerview, messageview->msginfo);
 

diff --git a/src/mh.c b/src/mh.c
index 2f3d8291710290fffc4765cb7969b67e7ca1c22e..33a63068198af0eba32a80daa94a8c740713b5cd 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 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
@@ -193,7 +193,7 @@ void mh_get_last_num(Folder *folder, FolderItem *item)
        }
 
        while ((d = readdir(dp)) != NULL) {
-               if ((num = to_number(d->d_name)) >= 0 &&
+               if ((num = to_number(d->d_name)) > 0 &&
                    dirent_is_regular_file(d)) {
                        if (max < num)
                                max = num;
@@ -233,7 +233,7 @@ gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list, gboolean *
        }
 
        while ((d = readdir(dp)) != NULL) {
-               if ((num = to_number(d->d_name)) >= 0) {
+               if ((num = to_number(d->d_name)) > 0) {
                        *list = g_slist_prepend(*list, GINT_TO_POINTER(num));
                        nummsgs++;
                }