From 7bc9dd80d59254caa10ec868144b3e047436a1d6 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 15 Apr 2005 08:14:15 +0000 Subject: [PATCH] 2005-04-15 [colin] 1.9.6cvs35 * src/prefs_account.c Fix cvs34. --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_account.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index af0a88c6c..a748a089f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-04-15 [colin] 1.9.6cvs35 + + * src/prefs_account.c + Fix cvs34. + 2005-04-12 [colin] 1.9.6cvs34 * src/prefs_account.c diff --git a/PATCHSETS b/PATCHSETS index afbd64ccb..560df89e6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -451,3 +451,4 @@ ( cvs diff -u -r 1.60.2.5 -r 1.60.2.6 src/filtering.c; ) > 1.9.6cvs32.patchset ( cvs diff -u -r 1.149.2.22 -r 1.149.2.23 src/inc.c; ) > 1.9.6cvs33.patchset ( cvs diff -u -r 1.105.2.21 -r 1.105.2.22 src/prefs_account.c; ) > 1.9.6cvs34.patchset +( cvs diff -u -r 1.105.2.22 -r 1.105.2.23 src/prefs_account.c; ) > 1.9.6cvs35.patchset diff --git a/configure.ac b/configure.ac index c69f0d88a..f7687ef43 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=34 +EXTRA_VERSION=35 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index e7a565689..cdb1f88bd 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -2558,14 +2558,11 @@ static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam) GtkWidget *menuitem; switch (type) { - case IMAP_AUTH_PLAIN: - gtk_option_menu_set_history(optmenu, 1); - break; case IMAP_AUTH_LOGIN: - gtk_option_menu_set_history(optmenu, 2); + gtk_option_menu_set_history(optmenu, 1); break; case IMAP_AUTH_CRAM_MD5: - gtk_option_menu_set_history(optmenu, 3); + gtk_option_menu_set_history(optmenu, 2); break; case 0: default: @@ -2596,15 +2593,18 @@ static void prefs_account_smtp_auth_type_set_optmenu(PrefParam *pparam) GtkWidget *menuitem; switch (type) { - case SMTPAUTH_LOGIN: + case SMTPAUTH_PLAIN: gtk_option_menu_set_history(optmenu, 1); break; - case SMTPAUTH_CRAM_MD5: + case SMTPAUTH_LOGIN: gtk_option_menu_set_history(optmenu, 2); break; - case SMTPAUTH_DIGEST_MD5: + case SMTPAUTH_CRAM_MD5: gtk_option_menu_set_history(optmenu, 3); break; + case SMTPAUTH_DIGEST_MD5: + gtk_option_menu_set_history(optmenu, 4); + break; case 0: default: gtk_option_menu_set_history(optmenu, 0); -- 2.25.1