talons

commit 6365a76142c2893db6122475cab51236e2dd0bed
parent 5cb69c583737e25ba445a7b6747f6b1a98e2bd2a
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 21 May 2008 06:42:15 +0000

2008-05-21 [colin]	3.4.0cvs59

	* src/mainwindow.c
		Don't put SMTP-only accounts in receive menus

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
6
++++++

4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21 [colin]	3.4.0cvs59
+
+	* src/mainwindow.c
+		Don't put SMTP-only accounts in receive menus
+
 2008-05-21 [colin]	3.4.0cvs58
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3354,3 +3354,4 @@
 ( cvs diff -u -r 1.179.2.220 -r 1.179.2.221 src/imap.c;  ) > 3.4.0cvs56.patchset
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2230,6 +2230,9 @@ static void main_window_set_account_receive_menu(MainWindow *mainwin,
 	for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
 		ac_prefs = (PrefsAccount *)cur_ac->data;
 
+		if (ac_prefs->protocol == A_NONE)
+			continue;
+
 		menuitem = gtk_menu_item_new_with_label
 			(ac_prefs->account_name ? ac_prefs->account_name
 			 : _("Untitled"));
@@ -2260,6 +2263,9 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
 	for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
 		ac_prefs = (PrefsAccount *)cur_ac->data;
 
+		if (ac_prefs->protocol == A_NONE)
+			continue;
+
 		menuitem = gtk_menu_item_new_with_label
 			(ac_prefs->account_name
 			 ? ac_prefs->account_name : _("Untitled"));