2005-04-04 [thorsten] 1.0.4cvs3

	* src/mh.c
		marks lost on filesystems with different stat() results on
		summer-/wintertime

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 13f0248902fa4d889d953c3194e56ad84da76964..b72099ac305f231120e8b32a83a9e8ad11a42484 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2005-04-04 [thorsten]  1.0.4cvs3
+
+       * src/mh.c
+               marks lost on filesystems with different stat() results on
+               summer-/wintertime
+
 2005-03-30 [colin]     1.0.4cvs2
 
        * src/common/socket.c

diff --git a/PATCHSETS b/PATCHSETS
index f0efad0c69af13832ef86fbce4434527329e2dad..4676080a9f013912acbf65caf0eafb94d1b1602f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -270,3 +270,4 @@
 ( cvs diff -u -r 1.459 -r 1.460 ChangeLog; cvs diff -u -r 1.454 -r 1.455 ChangeLog.jp; cvs diff -u -r 1.75 -r 1.76 src/codeconv.c; cvs diff -u -r 1.130 -r 1.131 src/textview.c; cvs diff -u -r 1.9 -r 1.10 src/unmime.c; cvs diff -u -r 1.2 -r 1.3 src/unmime.h; cvs diff -u -r 1.21 -r 1.22 src/common/smtp.c; ) > 1.0.3cvs8.patchset
 ( cvs diff -u -r 1.481 -r 1.482 src/compose.c; cvs diff -u -r 1.10 -r 1.11 src/gtk/gtkaspell.c; ) > 1.0.4cvs1.patchset
 ( cvs diff -u -r 1.16 -r 1.17 src/common/socket.c; cvs diff -u -r 1.209 -r 1.210 src/imap.c; ) > 1.0.4cvs2.patchset
+( cvs diff -u -r 1.88 -r 1.89 src/mh.c; ) > 1.0.4cvs3.patchset

diff --git a/configure.ac b/configure.ac
index 00e3349b2a7ceae3269b32754f44b62359ec93ca..495243f98eb9b707197afe7c3329acb37f777561 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/mh.c b/src/mh.c
index 26ee31499f801ee069bdac8ebdab08f98c03b8ad..6ceaea79dfd6066b953bff63aea01b59f12ca8c5 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -182,7 +182,8 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
                return FALSE;
        }
 
-       if (s.st_mtime > item->mtime) {
+       if ((s.st_mtime > item->mtime) &&
+               (s.st_mtime - 3600 != item->mtime)) {
                debug_print("MH scan required, folder updated: %s (%ld > %ld)\n",
                            path,
                            s.st_mtime,
@@ -515,7 +516,9 @@ static gboolean mh_is_msg_changed(Folder *folder, FolderItem *item,
 
        if (stat(itos(msginfo->msgnum), &s) < 0 ||
            msginfo->size  != s.st_size ||
-           msginfo->mtime != s.st_mtime)
+               (msginfo->mtime - s.st_mtime != 0) &&
+               (msginfo->mtime - s.st_mtime != 3600) &&
+               (msginfo->mtime - s.st_mtime != -3600))
                return TRUE;
 
        return FALSE;