2005-04-04 [thorsten] 1.9.6cvs24

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

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6dea041..aad9225 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-04-04 [thorsten]  1.9.6cvs24
+
+       * src/mh.c
+               marks lost on filesystems with different stat() results on
+               summer-/wintertime
+
 2005-04-03 [colin]     1.9.6cvs23
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index e8ef54b..896be50 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -440,3 +440,4 @@
 ( cvs diff -u -r 1.155.2.20 -r 1.155.2.21 src/Makefile.am; cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/stock_pixmap.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/dir-noselect.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/dir_noselect.xpm; ) > 1.9.6cvs21.patchset
 ( cvs diff -u -r 1.395.2.63 -r 1.395.2.64 src/summaryview.c; ) > 1.9.6cvs22.patchset
 ( cvs diff -u -r 1.395.2.64 -r 1.395.2.65 src/summaryview.c; ) > 1.9.6cvs23.patchset
+( cvs diff -u -r 1.79.2.9 -r 1.79.2.10 src/mh.c; ) > 1.9.6cvs24.patchset

diff --git a/configure.ac b/configure.ac
index b4df507..3059618 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mh.c b/src/mh.c
index eb69f4c..dbcde04 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -185,7 +185,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,
@@ -518,7 +519,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;