2006-08-22 [colin] 2.4.0cvs75

	* src/mh.c
		Check if scan is required before touching
		the folder (or it'll be required every time)

diff --git a/ChangeLog b/ChangeLog
index 8fad3467b972637d7fab17ff0bf7c8153c149e57..4da798c3c47eb8442c88a98b54b3c1b8d5f080d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-22 [colin]     2.4.0cvs75
+
+       * src/mh.c
+               Check if scan is required before touching
+               the folder (or it'll be required every time)
+
 2006-08-22 [colin]     2.4.0cvs74
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 5d49f289782bdf4b75d94a80dd0d2215498e376d..cf1d01784c30c0a9dd93acefefa633714c510140 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1766,3 +1766,4 @@
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/account.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/faq.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/handling.xml;  ) > 2.4.0cvs72.patchset
 ( cvs diff -u -r 1.213.2.106 -r 1.213.2.107 src/folder.c;  cvs diff -u -r 1.207.2.112 -r 1.207.2.113 src/folderview.c;  cvs diff -u -r 1.150.2.73 -r 1.150.2.74 src/procmsg.c;  cvs diff -u -r 1.395.2.230 -r 1.395.2.231 src/summaryview.c;  cvs diff -u -r 1.36.2.75 -r 1.36.2.76 src/common/utils.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.38 -r 1.5.2.39 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/gtk/gtkutils.h;  ) > 2.4.0cvs73.patchset
 ( cvs diff -u -r 1.654.2.1812 -r 1.654.2.1813 configure.ac;  ) > 2.4.0cvs74.patchset
+( cvs diff -u -r 1.79.2.36 -r 1.79.2.37 src/mh.c;  ) > 2.4.0cvs75.patchset

diff --git a/configure.ac b/configure.ac
index 7bc2af7dca9f23da07c22a095a1bdb81fcd62395..4a7d0e1122126d82066c67030b9b8cd216be82d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mh.c b/src/mh.c
index 76a603c159dc68556fd3be11785fdccfb385af57..e0b7edd61a0917a1f86e90d59af7878addc454b8 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -492,6 +492,8 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
 
        srcpath = folder_item_get_path(msginfo->folder);
 
+       dest_need_scan = mh_scan_required(dest->folder, dest);
+
        total = g_slist_length(msglist);
        if (total > 100) {
                if (MSG_IS_MOVE(msginfo->flags))
@@ -567,7 +569,6 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
        g_free(srcpath);
        mh_write_sequences(dest, TRUE);
 
-       dest_need_scan = mh_scan_required(dest->folder, dest);
        if (!dest_need_scan)
                dest->mtime = time(NULL);
        
@@ -623,6 +624,8 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
 
        path = folder_item_get_path(item);
        
+       need_scan = mh_scan_required(folder, item);
+
        for (cur = msglist; cur; cur = cur->next) {
                MsgInfo *msginfo = (MsgInfo *)cur->data;
                if (msginfo == NULL)
@@ -639,8 +642,6 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
                g_free(file);
        }
 
-       need_scan = mh_scan_required(folder, item);
-
        if (!need_scan)
                item->mtime = time(NULL);