talons

commit 48d19e2110d91088a652efb6577331c267e98b6d
parent 78810ba2ca3a5bf00c32746f7b18d21b647a27a8
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 12 Sep 2012 09:27:43 +0000

2012-09-12 [colin]	3.8.1cvs53

	* src/procmsg.c
		Revert that hunk, logic is unclear.

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/procmsg.c
 | 
2
+-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-12 [colin]	3.8.1cvs53
+
+	* src/procmsg.c
+		Revert that hunk, logic is unclear.
+
 2012-09-12 [colin]	3.8.1cvs52
 
 	* src/addressbook.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4427,3 +4427,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 claws-mail.pc.in;  ) > 3.8.1cvs50.patchset
 ( cvs diff -u -r 1.382.2.610 -r 1.382.2.611 src/compose.c;  cvs diff -u -r 1.79.2.75 -r 1.79.2.76 src/mh.c;  cvs diff -u -r 1.9.2.55 -r 1.9.2.56 src/common/ssl.c;  cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/passphrase.c;  ) > 3.8.1cvs51.patchset
 ( cvs diff -u -r 1.60.2.149 -r 1.60.2.150 src/addressbook.c;  cvs diff -u -r 1.6.10.27 -r 1.6.10.28 src/addrharvest.c;  cvs diff -u -r 1.28.2.49 -r 1.28.2.50 src/addrindex.c;  cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/addritem.c;  cvs diff -u -r 1.382.2.611 -r 1.382.2.612 src/compose.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/edittags.c;  cvs diff -u -r 1.213.2.210 -r 1.213.2.211 src/folder.c;  cvs diff -u -r 1.179.2.259 -r 1.179.2.260 src/imap.c;  cvs diff -u -r 1.149.2.109 -r 1.149.2.110 src/inc.c;  cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/ldif.c;  cvs diff -u -r 1.274.2.350 -r 1.274.2.351 src/mainwindow.c;  cvs diff -u -r 1.28.2.52 -r 1.28.2.53 src/mbox.c;  cvs diff -u -r 1.83.2.194 -r 1.83.2.195 src/mimeview.c;  cvs diff -u -r 1.6.10.21 -r 1.6.10.22 src/mutt.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/partial_download.c;  cvs diff -u -r 1.1.4.78 -r 1.1.4.79 src/prefs_filtering_action.c;  cvs diff -u -r 1.30.2.73 -r 1.30.2.74 src/prefs_toolbar.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/printing.c;  cvs diff -u -r 1.47.2.58 -r 1.47.2.59 src/procheader.c;  cvs diff -u -r 1.49.2.149 -r 1.49.2.150 src/procmime.c;  cvs diff -u -r 1.150.2.126 -r 1.150.2.127 src/procmsg.c;  cvs diff -u -r 1.395.2.452 -r 1.395.2.453 src/summaryview.c;  cvs diff -u -r 1.96.2.247 -r 1.96.2.248 src/textview.c;  cvs diff -u -r 1.36.2.200 -r 1.36.2.201 src/common/utils.c;  cvs diff -u -r 1.1.4.119 -r 1.1.4.120 src/etpan/imap-thread.c;  cvs diff -u -r 1.9.2.80 -r 1.9.2.81 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/plugins/pgpcore/sgpgme.c;  ) > 3.8.1cvs52.patchset
+( cvs diff -u -r 1.150.2.127 -r 1.150.2.128 src/procmsg.c;  ) > 3.8.1cvs53.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=52
+EXTRA_VERSION=53
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -827,6 +827,7 @@ static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list)
 	debug_print("\n");
 
 parse_again:	
+	nothing_to_sort = TRUE;
 	cur = orig;
 	while (cur) {
 		gchar *file = NULL;
@@ -843,7 +844,6 @@ parse_again:
 			nothing_to_sort = FALSE;
 			goto parse_again;
 		}
-		nothing_to_sort = TRUE;
 		cur = cur->next;
 	}