talons

commit 43c98c4cf6740306767eae0edaa550fe23b09585
parent dded85d85b831e999c076c1f935eb4764315624e
Author: Paul Mangan <paul@claws-mail.org>
Date:   Mon, 29 Dec 2008 13:40:28 +0000

2008-12-29 [paul]	3.7.0cvs6

	* src/procmsg.c
		prefer List-Id header to X-* headers when creating
		filter rule automatically

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

4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-29 [paul]	3.7.0cvs6
+
+	* src/procmsg.c
+		prefer List-Id header to X-* headers when creating
+		filter rule automatically
+
 2008-12-28 [colin]	3.7.0cvs5
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3667,3 +3667,4 @@
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 tools/claws.i18n.status.pl;  ) > 3.7.0cvs3.patchset
 ( cvs diff -u -r 1.382.2.490 -r 1.382.2.491 src/compose.c;  ) > 3.7.0cvs4.patchset
 ( cvs diff -u -r 1.382.2.491 -r 1.382.2.492 src/compose.c;  ) > 3.7.0cvs5.patchset
+( cvs diff -u -r 1.150.2.110 -r 1.150.2.111 src/procmsg.c;  ) > 3.7.0cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -580,7 +580,10 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
 	hentry[idx].body = NULL;	\
 }
 
-		if (hentry[H_X_BEENTHERE].body != NULL) {
+		if (hentry[H_LIST_ID].body != NULL) {
+			SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
+			extract_list_id_str(*key);
+		} else if (hentry[H_X_BEENTHERE].body != NULL) {
 			SET_FILTER_KEY("header \"X-BeenThere\"", H_X_BEENTHERE);
 		} else if (hentry[H_X_ML_NAME].body != NULL) {
 			SET_FILTER_KEY("header \"X-ML-Name\"", H_X_ML_NAME);
@@ -588,10 +591,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
 			SET_FILTER_KEY("header \"X-List\"", H_X_LIST);
 		} else if (hentry[H_X_MAILING_LIST].body != NULL) {
 			SET_FILTER_KEY("header \"X-Mailing-List\"", H_X_MAILING_LIST);
-		} else if (hentry[H_LIST_ID].body != NULL) {
-			SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
-			extract_list_id_str(*key);
-		} else if (hentry[H_X_SEQUENCE].body != NULL) {
+		} else  if (hentry[H_X_SEQUENCE].body != NULL) {
 			gchar *p;
 
 			SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);