send_message_queue_all(): follow the change of compose.c::compose_send().

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@788 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 19 insertions, 13 deletions

diff --git a/src/send_message.c b/src/send_message.c
index ab67e90a..c4e81e21 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -345,22 +345,28 @@ gint send_message_queue_all(FolderItem *queue, gboolean save_msgs,
 		if (send_get_queue_contents(qinfo, tmp) == 0) {
 			if (save_msgs) {
 				FolderItem *outbox;
-				outbox = account_get_special_folder
-					(qinfo->ac, F_OUTBOX);
-				procmsg_save_to_outbox(outbox, tmp);
-			}
-			if (filter_msgs) {
-				FilterInfo *fltinfo;
+				gboolean drop_done = FALSE;
+
+				if (filter_msgs) {
+					FilterInfo *fltinfo;
 
-				fltinfo = filter_info_new();
-				fltinfo->account = qinfo->ac;
-				fltinfo->flags.perm_flags = 0;
-				fltinfo->flags.tmp_flags = MSG_RECEIVED;
+					fltinfo = filter_info_new();
+					fltinfo->account = qinfo->ac;
+					fltinfo->flags.perm_flags = 0;
+					fltinfo->flags.tmp_flags = MSG_RECEIVED;
 
-				filter_apply(prefs_common.fltlist, tmp,
-					     fltinfo);
+					filter_apply(prefs_common.fltlist, tmp,
+						     fltinfo);
 
-				filter_info_free(fltinfo);
+					drop_done = fltinfo->drop_done;
+					filter_info_free(fltinfo);
+				}
+
+				if (!drop_done) {
+					outbox = account_get_special_folder
+						(qinfo->ac, F_OUTBOX);
+					procmsg_save_to_outbox(outbox, tmp);
+				}
 			}
 			g_unlink(tmp);
 		}