talons

commit ef234375d7bfcffe738e39dcff1af0af8c8fc6fe
parent abd96f87300f2e12231830798d79659d5dabfc62
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  9 Dec 2008 06:49:07 +0000

2008-12-09 [colin]	3.6.1cvs64

	* src/prefs_filtering.c
		Fix bug 1789, 'filtering account selection
		(regression)'. Filtering on sending-only
		accounts can be a little useful when using
		filtering via Tools menu.

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_filtering.c
 | 
3
+--

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-09 [colin]	3.6.1cvs64
+
+	* src/prefs_filtering.c
+		Fix bug 1789, 'filtering account selection 
+		(regression)'. Filtering on sending-only
+		accounts can be a little useful when using
+		filtering via Tools menu.
+
 2008-12-07 [paul]	3.6.1cvs63
 
 	* src/prefs_actions.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3645,3 +3645,4 @@
 ( cvs diff -u -r 1.65.2.63 -r 1.65.2.64 src/codeconv.c;  cvs diff -u -r 1.49.2.122 -r 1.49.2.123 src/procmime.c;  ) > 3.6.1cvs61.patchset
 ( cvs diff -u -r 1.105.2.148 -r 1.105.2.149 src/prefs_account.c;  cvs diff -u -r 1.5.2.54 -r 1.5.2.55 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.13 -r 1.7.2.14 src/gtk/prefswindow.h;  ) > 3.6.1cvs62.patchset
 ( cvs diff -u -r 1.60.2.66 -r 1.60.2.67 src/prefs_actions.c;  cvs diff -u -r 1.5.2.55 -r 1.5.2.56 src/gtk/pluginwindow.c;  ) > 3.6.1cvs63.patchset
+( cvs diff -u -r 1.59.2.74 -r 1.59.2.75 src/prefs_filtering.c;  ) > 3.6.1cvs64.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -260,8 +260,7 @@ static void prefs_filtering_account_option_menu_populate(void)
 	for (; accounts != NULL; accounts = accounts->next) {
 		PrefsAccount *ac = (PrefsAccount *)accounts->data;
 
-		if (ac->protocol != A_NONE)
-			COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id);
+		COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id);
 	}
 }