From f4ef4a5ff6bbfbbbfa3d0d180b194cb9bc1e6916 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 21 May 2008 10:00:16 +0000 Subject: [PATCH] 2008-05-21 [wwp] 3.4.0cvs60 * src/prefs_filtering.c Don't show SMTP-only accounts in accounts list, as they are irrelevant for filtering incoming messages. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_filtering.c | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36f08c525..fadfe50ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-21 [wwp] 3.4.0cvs60 + + * src/prefs_filtering.c + Don't show SMTP-only accounts in accounts list, as they are + irrelevant for filtering incoming messages. + 2008-05-21 [colin] 3.4.0cvs59 * src/mainwindow.c diff --git a/PATCHSETS b/PATCHSETS index 153e8689e..fd1f8f149 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3355,3 +3355,4 @@ ( cvs diff -u -r 1.36.2.139 -r 1.36.2.140 src/common/utils.c; ) > 3.4.0cvs57.patchset ( cvs diff -u -r 1.179.2.221 -r 1.179.2.222 src/imap.c; ) > 3.4.0cvs58.patchset ( cvs diff -u -r 1.274.2.242 -r 1.274.2.243 src/mainwindow.c; ) > 3.4.0cvs59.patchset +( cvs diff -u -r 1.59.2.68 -r 1.59.2.69 src/prefs_filtering.c; ) > 3.4.0cvs60.patchset diff --git a/configure.ac b/configure.ac index 25ec721d5..146145890 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=59 +EXTRA_VERSION=60 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index 0d7b933ef..b26fea15b 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -261,7 +261,8 @@ static void prefs_filtering_account_option_menu_populate(void) for (; accounts != NULL; accounts = accounts->next) { PrefsAccount *ac = (PrefsAccount *)accounts->data; - COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id); + if (ac->protocol != A_NONE) + COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id); } } -- 2.25.1