From 2ca67302ef030ee43ef42940873d22c49d18570e Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 30 Sep 2006 17:45:27 +0000 Subject: [PATCH] 2006-09-30 [colin] 2.5.2cvs26 * src/mh.c Don't let the writing of .mh_sequences, which can change the folder's mtime, let us think we need to scan. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mh.c | 8 ++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1b5906f2e..6e0a5fca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-30 [colin] 2.5.2cvs26 + + * src/mh.c + Don't let the writing of .mh_sequences, which + can change the folder's mtime, let us think + we need to scan. + 2006-09-30 [colin] 2.5.2cvs25 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 7a0c77fb8..b0030c0f0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1939,3 +1939,4 @@ ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/fix_date.sh; ) > 2.5.2cvs23.patchset ( cvs diff -u -r 1.16.2.40 -r 1.16.2.41 src/msgcache.c; cvs diff -u -r 1.150.2.80 -r 1.150.2.81 src/procmsg.c; cvs diff -u -r 1.36.2.80 -r 1.36.2.81 src/common/utils.c; ) > 2.5.2cvs24.patchset ( cvs diff -u -r 1.213.2.115 -r 1.213.2.116 src/folder.c; cvs diff -u -r 1.395.2.258 -r 1.395.2.259 src/summaryview.c; ) > 2.5.2cvs25.patchset +( cvs diff -u -r 1.79.2.41 -r 1.79.2.42 src/mh.c; ) > 2.5.2cvs26.patchset diff --git a/configure.ac b/configure.ac index 069c121b1..ee38645cb 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mh.c b/src/mh.c index 93df162e6..142e9ec54 100644 --- a/src/mh.c +++ b/src/mh.c @@ -1396,6 +1396,14 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen) static int mh_item_close(Folder *folder, FolderItem *item) { + time_t last_mtime = (time_t)0; + gboolean need_scan = mh_scan_required(item->folder, item); + last_mtime = item->mtime; + mh_write_sequences(item, FALSE); + + if (item->mtime == last_mtime && !need_scan) + item->mtime = time(NULL); + return 0; } -- 2.25.1