CVS: sylpheed-claws/src prefs_matcher.c,1.43.2.36,1.43.2.36.2.1

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26912/src

Modified Files:
      Tag: stable_2_1
	prefs_matcher.c 
Log Message:
2006-04-20 [colin]	2.1.1cvs5-stable

	* src/prefs_matcher.c
		From 2.1.1cvs16
		Fix ~test and test conditions not updating
		properly

Index: prefs_matcher.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.36
retrieving revision 1.43.2.36.2.1
diff -u -r1.43.2.36 -r1.43.2.36.2.1
--- prefs_matcher.c	12 Mar 2006 10:36:14 -0000	1.43.2.36
+++ prefs_matcher.c	20 Apr 2006 05:13:44 -0000	1.43.2.36.2.1
@@ -1844,14 +1844,15 @@
 	case MATCHCRITERIA_NOT_FROM:
 	case MATCHCRITERIA_NOT_TO:
 	case MATCHCRITERIA_NOT_CC:
+	case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
 	case MATCHCRITERIA_NOT_NEWSGROUPS:
 	case MATCHCRITERIA_NOT_INREPLYTO:
 	case MATCHCRITERIA_NOT_REFERENCES:
-	case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
-	case MATCHCRITERIA_NOT_BODY_PART:
-	case MATCHCRITERIA_NOT_MESSAGE:
-	case MATCHCRITERIA_NOT_HEADERS_PART:
 	case MATCHCRITERIA_NOT_HEADER:
+	case MATCHCRITERIA_NOT_HEADERS_PART:
+	case MATCHCRITERIA_NOT_MESSAGE:
+	case MATCHCRITERIA_NOT_BODY_PART:
+	case MATCHCRITERIA_NOT_TEST:
 		negative_cond = TRUE;
 		break;
 	}
@@ -1871,6 +1872,7 @@
 	case MATCHCRITERIA_NOT_HEADERS_PART:
 	case MATCHCRITERIA_NOT_BODY_PART:
 	case MATCHCRITERIA_NOT_MESSAGE:
+	case MATCHCRITERIA_NOT_TEST:
 	case MATCHCRITERIA_SUBJECT:
 	case MATCHCRITERIA_FROM:
 	case MATCHCRITERIA_TO:
@@ -1910,11 +1912,14 @@
 		break;
 	}
 
-	if (negative_cond)
+	if (negative_cond) {
 		gtk_list_select_item(GTK_LIST(matcher.predicate_list), 1);
-	else
+		gtk_list_select_item(GTK_LIST(matcher.predicate_flag_list), 1);
+	} else {
 		gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
-
+		gtk_list_select_item(GTK_LIST(matcher.predicate_flag_list), 0);
+	}
+	
 	switch(prop->matchtype) {
 	case MATCHTYPE_MATCH:
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642