2010-02-10 [colin] 3.7.5cvs17

	* src/prefs_matcher.c
		Fix bug 2099, 'add List-Id in Configuration>Filtering>
		Condition>Define>Header>Name combo box'. Patch by
		Francois Cami

diff --git a/ChangeLog b/ChangeLog
index e00928b96c8a7add5339435aa26d8383748f93a8..d541e61de9119cc98c0ff0ce477c45029769e173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10 [colin]     3.7.5cvs17
+
+       * src/prefs_matcher.c
+               Fix bug 2099, 'add List-Id in Configuration>Filtering>
+               Condition>Define>Header>Name combo box'. Patch by
+               Francois Cami
+
 2010-02-10 [colin]     3.7.5cvs16
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 6c489e7b0ae3b0211e7a435b6db6a6a30a5bd838..083837b9d11d1a32b955294fa8fef515062d4355 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3957,3 +3957,4 @@
 ( cvs diff -u -r 1.105.2.157 -r 1.105.2.158 src/prefs_account.c;  cvs diff -u -r 1.52.2.78 -r 1.52.2.79 src/prefs_folder_item.c;  cvs diff -u -r 1.12.2.72 -r 1.12.2.73 src/prefs_template.c;  cvs diff -u -r 1.8.2.41 -r 1.8.2.42 src/quote_fmt.c;  ) > 3.7.5cvs14.patchset
 ( cvs diff -u -r 1.654.2.4027 -r 1.654.2.4028 configure.ac;  ) > 3.7.5cvs15.patchset
 ( cvs diff -u -r 1.65.2.69 -r 1.65.2.70 src/codeconv.c;  cvs diff -u -r 1.15.2.23 -r 1.15.2.24 src/codeconv.h;  cvs diff -u -r 1.382.2.544 -r 1.382.2.545 src/compose.c;  cvs diff -u -r 1.274.2.305 -r 1.274.2.306 src/mainwindow.c;  cvs diff -u -r 1.94.2.209 -r 1.94.2.210 src/messageview.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_send.c;  cvs diff -u -r 1.49.2.131 -r 1.49.2.132 src/procmime.c;  cvs diff -u -r 1.96.2.221 -r 1.96.2.222 src/textview.c;  ) > 3.7.5cvs16.patchset
+( cvs diff -u -r 1.43.2.83 -r 1.43.2.84 src/prefs_matcher.c;  ) > 3.7.5cvs17.patchset

diff --git a/configure.ac b/configure.ac
index ecf0c8ffaac61ef02bab254e40d6b5eee4d25aab..29d63b7d3b683a1844b14a3db242e404c3654049 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 82b922de1d73e4db9c2eb2aac9a1c2e9a400819b..4cfc74ff5c81ce9919e0c415352aec6514f65f8d 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -359,6 +359,7 @@ static void prefs_matcher_models_create(void)
        COMBOBOX_ADD(store, "X-Mailer", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "X-BeenThere", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "List-Post", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "List-Id", CRITERIA_HEADER);
        matcher.model_headers = GTK_TREE_MODEL(store);
        
        store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);