2007-12-23 [paul] 3.2.0cvs16

	* src/prefs_matcher.c
		fix bug 1436, 'Filter condition dialog doesn't
		load header name from current rules'

diff --git a/ChangeLog b/ChangeLog
index a7e9d90108c77df320ef3f7ac2b34ceeb6c0112e..65e3252ac9c6ef9d1ad46d8122695cf162f3f751 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-23 [paul]      3.2.0cvs16
+
+       * src/prefs_matcher.c
+               fix bug 1436, 'Filter condition dialog doesn't
+               load header name from current rules'
+
 2007-12-22 [paul]      3.2.0cvs15
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ae6d0eed22d05597b45f1003fc39479f66a2a9c1..652c713072c921e3b426d410c6abf7aea8f4e3a3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3152,3 +3152,4 @@
 ( cvs diff -u -r 1.179.2.205 -r 1.179.2.206 src/imap.c;  ) > 3.2.0cvs13.patchset
 ( cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/common/ssl_certificate.c;  ) > 3.2.0cvs14.patchset
 ( cvs diff -u -r 1.382.2.427 -r 1.382.2.428 src/compose.c;  ) > 3.2.0cvs15.patchset
+( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/prefs_matcher.c;  ) > 3.2.0cvs16.patchset

diff --git a/configure.ac b/configure.ac
index bbe30efa99d9ddf981725b2353ecedea8d7a754c..af222baf028f77561c34b9284548da6e8730fc17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 0c978fae609984936fc3855824b1a24462e5d7c1..1737f7edb5f288fda9b0250992a2dcd8fdf62e93 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -337,14 +337,14 @@ static void prefs_matcher_models_create(void)
        matcher.model_contain = GTK_TREE_MODEL(store);
        
        store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
-       COMBOBOX_ADD(store, "Subject", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "From", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "To", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "Cc", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "To or Cc", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "Newsgroups", CRITERIA_HEADER);
-       COMBOBOX_ADD(store, "References", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "Subject", CRITERIA_SUBJECT);
+       COMBOBOX_ADD(store, "From", CRITERIA_FROM);
+       COMBOBOX_ADD(store, "To", CRITERIA_TO);
+       COMBOBOX_ADD(store, "Cc", CRITERIA_CC);
+       COMBOBOX_ADD(store, "To or Cc", CRITERIA_TO_OR_CC);
+       COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_INREPLYTO);
+       COMBOBOX_ADD(store, "Newsgroups", CRITERIA_NEWSGROUPS);
+       COMBOBOX_ADD(store, "References", CRITERIA_REFERENCES);
        COMBOBOX_ADD(store, "Sender", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "X-ML-Name", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "X-List", CRITERIA_HEADER);