CVS: sylpheedclaws/sylpheed-claws/src filtering.c,1.60.2.16,1.60.2.17

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv2906/src

Modified Files:
      Tag: gtk2
	filtering.c 
Log Message:
2006-05-22 [colin]	2.2.0cvs46

	* src/filtering.c
		Fix possible infinite loop. 'copy' is not a 
		final action, so when encountering a 'copy',
		we have to check if a previous one was set
		and do it. In the same way, if we encounter
		a 'move' we have to perform a possibly 
		pending 'copy'. This will slow down filtering
		on IMAP if move+copy or multiple copy actions
		are to be done, but handling it via the batch
		would be really too convoluted.

Index: filtering.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/filtering.c,v
retrieving revision 1.60.2.16
retrieving revision 1.60.2.17
diff -u -d -r1.60.2.16 -r1.60.2.17
--- filtering.c	2006/05/13 13:04:54	1.60.2.16
+++ filtering.c	2006/05/22 16:36:57	1.60.2.17
@@ -263,6 +263,13 @@
 			return FALSE;
 		}
 		
+		/* check if mail is set to copy already, 
+		 * in which case we have to do it */
+		if (info->is_copy && info->to_filter_folder) {
+			debug_print("should cp and mv !\n");
+			folder_item_copy_msg(info->to_filter_folder, info);
+			info->is_copy = FALSE;
+		}
 		/* mark message to be moved */		
 		info->is_move = TRUE;
 		info->to_filter_folder = dest_folder;
@@ -279,6 +286,13 @@
 			return FALSE;
 		}
 
+		/* check if mail is set to copy already, 
+		 * in which case we have to do it */
+		if (info->is_copy && info->to_filter_folder) {
+			debug_print("should cp and mv !\n");
+			folder_item_copy_msg(info->to_filter_folder, info);
+			info->is_copy = FALSE;
+		}
 		/* mark message to be copied */		
 		info->is_copy = TRUE;
 		info->to_filter_folder = dest_folder;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]