2006-02-06 [colin] 2.0.0cvs23

	* src/procmsg.h
	* src/filtering.c
		Use a special field for batch filtering instead
		of stepping on deferred execution's toes

diff --git a/ChangeLog b/ChangeLog
index d686fa50867641b24e2bb2272a6aeff84642da57..d0eb9dfd724174a4f04d8f42fc876e6ec2b652f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-06 [colin]     2.0.0cvs23
+
+       * src/procmsg.h
+       * src/filtering.c
+               Use a special field for batch filtering instead
+               of stepping on deferred execution's toes
+
 2006-02-06 [colin]     2.0.0cvs22
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 35a8ee89a996280447d4e488d913d4be80c9ed38..4137dfd312ebb2fe0304c38d85ef10bbb7c23e6d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1206,3 +1206,4 @@
 ( cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/addressbook.c;  cvs diff -u -r 1.382.2.234 -r 1.382.2.235 src/compose.c;  cvs diff -u -r 1.207.2.87 -r 1.207.2.88 src/folderview.c;  cvs diff -u -r 1.20.2.10 -r 1.20.2.11 src/folderview.h;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/headerview.c;  cvs diff -u -r 1.96.2.93 -r 1.96.2.94 src/textview.c;  cvs diff -u -r 1.83.2.63 -r 1.83.2.64 src/mimeview.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_message.c;  cvs diff -u -r 1.395.2.163 -r 1.395.2.164 src/summaryview.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/gtk/gtkutils.h;  ) > 2.0.0cvs20.patchset
 ( cvs diff -u -r 1.179.2.91 -r 1.179.2.92 src/imap.c;  cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/filtering.c;  cvs diff -u -r 1.21.2.4 -r 1.21.2.5 src/filtering.h;  cvs diff -u -r 1.149.2.42 -r 1.149.2.43 src/inc.c;  cvs diff -u -r 1.213.2.78 -r 1.213.2.79 src/folder.c;  cvs diff -u -r 1.28.2.12 -r 1.28.2.13 src/mbox.c;  cvs diff -u -r 1.150.2.50 -r 1.150.2.51 src/procmsg.c; cvs diff -u -r 1.60.2.21 -r 1.60.2.22 src/procmsg.h; ) > 2.0.0cvs21.patchset
 ( cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/action.c;  cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/filtering.c;  cvs diff -u -r 1.21.2.5 -r 1.21.2.6 src/filtering.h;  cvs diff -u -r 1.213.2.79 -r 1.213.2.80 src/folder.c;  cvs diff -u -r 1.395.2.164 -r 1.395.2.165 src/summaryview.c;  ) > 2.0.0cvs22.patchset
+( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/procmsg.h;  cvs diff -u -r 1.60.2.11 -r 1.60.2.12 src/filtering.c;  ) > 2.0.0cvs23.patchset

diff --git a/configure.ac b/configure.ac
index 80dc53ffa3f9ef3059287f57da148655d12f6ae0..2a185ff3251d3d6aebd1bf24af62d753aefddc40 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=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index cf64fc6c229a8beb55ba7db9180d583f8fafa971..9096197d00571ec7633ceb18bc661dddbcf2a065 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -184,7 +184,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
                for (cur = messages; cur; cur = cur->next) {
                        MsgInfo *info = (MsgInfo *)cur->data;
                        if (last_item == NULL) {
-                               last_item = info->to_folder;
+                               last_item = info->to_filter_folder;
                        }
                        if (last_item == NULL)
                                continue;
@@ -196,7 +196,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
                                        is_move = TRUE;
                        }
                        found++;
-                       if (info->to_folder == last_item 
+                       if (info->to_filter_folder == last_item 
                        &&  info->is_copy == is_copy
                        &&  info->is_move == is_move) {
                                batch = g_slist_append(batch, info);
@@ -263,7 +263,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
                
                /* mark message to be moved */          
                info->is_move = TRUE;
-               info->to_folder = dest_folder;
+               info->to_filter_folder = dest_folder;
                debug_print("set to move to %s\n", folder_item_get_path(dest_folder));
                return TRUE;
 
@@ -279,7 +279,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 
                /* mark message to be copied */         
                info->is_copy = TRUE;
-               info->to_folder = dest_folder;
+               info->to_filter_folder = dest_folder;
                debug_print("set to copy to %s\n", folder_item_get_path(dest_folder));
                return TRUE;
 

diff --git a/src/procmsg.h b/src/procmsg.h
index 544be7eb2a591cddb89e33a3ebe05d940fe69dc1..33b1cf0e4a044bbbf437c284eb4b6f6909203e41 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -190,7 +190,8 @@ struct _MsgInfo
 
        FolderItem *folder;
        FolderItem *to_folder;
-       
+
+       FolderItem *to_filter_folder;   
        gboolean is_move;
        gboolean is_copy;