aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-callbacks.c32
-rw-r--r--mail/mail-mt.c14
3 files changed, 33 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c7781e86a0..ea10e9f2f7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-25 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-mt.c (pass_got): Only cache the password for the service if
+ it has an entry in the account database. Fixes bug #10875.
+
2001-09-24 Christopher James Lahey <clahey@ximian.com>
* message-list.c (filter_date): Use e_strftime_fix_am_pm instead
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 02a2ce9da3..5ad09bf98f 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -695,9 +695,12 @@ list_add_addresses (GList *list, const CamelInternetAddress *cia, const GSList *
}
if (notme && !g_hash_table_lookup (rcpt_hash, addr)) {
- EDestination *dest = e_destination_new ();
+ EDestination *dest;
+
+ dest = e_destination_new ();
e_destination_set_name (dest, name);
e_destination_set_email (dest, addr);
+
list = g_list_append (list, dest);
g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1));
}
@@ -827,11 +830,14 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
break;
}
}
-
+
if (address && i != max) {
- EDestination *dest = e_destination_new ();
+ EDestination *dest;
+
+ dest = e_destination_new ();
e_destination_set_name (dest, name);
e_destination_set_email (dest, address);
+
to = g_list_append (to, dest);
}
}
@@ -848,7 +854,9 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
if (reply_to) {
/* Get the Reply-To address so we can ignore references to it in the Cc: list */
if (camel_internet_address_get (reply_to, 0, &name, &reply_addr)) {
- EDestination *dest = e_destination_new ();
+ EDestination *dest;
+
+ dest = e_destination_new ();
e_destination_set_name (dest, name);
e_destination_set_email (dest, reply_addr);
g_message (">>>>>>>>>> [%s] [%s]", name, reply_addr);
@@ -891,15 +899,15 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
tov = e_destination_list_to_vector (to);
ccv = e_destination_list_to_vector (cc);
-
+
g_list_free (to);
g_list_free (cc);
-
+
e_msg_composer_set_headers (composer, me ? me->name : NULL, tov, ccv, NULL, subject);
-
+
e_destination_freev (tov);
e_destination_freev (ccv);
-
+
g_free (subject);
/* Add In-Reply-To and References. */
@@ -925,9 +933,9 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
}
static void
-requeue_mail_reply(CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data)
+requeue_mail_reply (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data)
{
- int mode = GPOINTER_TO_INT(data);
+ int mode = GPOINTER_TO_INT (data);
mail_reply (folder, msg, uid, mode);
}
@@ -943,10 +951,10 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mod
if (!msg) {
mail_get_message (folder, uid, requeue_mail_reply,
- GINT_TO_POINTER(mode), mail_thread_new);
+ GINT_TO_POINTER (mode), mail_thread_new);
return;
}
-
+
psd = g_new (struct post_send_data, 1);
psd->folder = folder;
camel_object_ref (CAMEL_OBJECT (psd->folder));
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 2324fa64ce..69646e44fd 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -450,12 +450,14 @@ pass_got (char *string, void *data)
service = mca->transport;
}
- mail_config_service_set_save_passwd (service, remember);
-
- /* set `remember' to TRUE because people don't want to have to
- re-enter their passwords for this session even if they told
- us not to cache their passwords in the dialog...*sigh* */
- remember = TRUE;
+ if (mca) {
+ mail_config_service_set_save_passwd (service, remember);
+
+ /* set `remember' to TRUE because people don't want to have to
+ re-enter their passwords for this session even if they told
+ us not to cache their passwords in the dialog...*sigh* */
+ remember = TRUE;
+ }
}
if (m->cache)