From c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 5 Oct 2001 22:17:04 +0000 Subject: Fix a merge-conflict leftover. 2001-10-05 Jeffrey Stedfast * mail-mt.c (pass_got): Fix a merge-conflict leftover. svn path=/trunk/; revision=13474 --- mail/ChangeLog | 4 ++++ mail/mail-mt.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 6ae2d17b7b..cc7326654e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Jeffrey Stedfast + + * mail-mt.c (pass_got): Fix a merge-conflict leftover. + 2001-10-05 * folder-browser.c: reformatted the menu tables so they're a bit diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 58b43c3b2e..cf3e1878db 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -472,10 +472,7 @@ pass_got (char *string, void *data) service = mca->transport; } - if (service) - mail_config_service_set_save_passwd (service, remember); - - if (mca) { + if (service) { mail_config_service_set_save_passwd (service, remember); /* set `remember' to TRUE because people don't want to have to -- cgit v1.2.3