aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-10-06 06:17:04 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-10-06 06:17:04 +0800
commitc0af9ae948d8e7aa7d53bb3aefdcb792d97eae32 (patch)
tree63083ff322c6b09f1c5e4332fcd31917f6ad795d
parentef960f1216ade67969145104028d78a9124111e9 (diff)
downloadgsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar.gz
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar.bz2
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar.lz
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar.xz
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.tar.zst
gsoc2013-evolution-c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32.zip
Fix a merge-conflict leftover.
2001-10-05 Jeffrey Stedfast <fejj@ximian.com> * mail-mt.c (pass_got): Fix a merge-conflict leftover. svn path=/trunk/; revision=13474
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-mt.c5
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 <fejj@ximian.com>
+
+ * mail-mt.c (pass_got): Fix a merge-conflict leftover.
+
2001-10-05 <NotZed@Ximian.com>
* 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