diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-10-15 22:16:45 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-10-15 22:16:45 +0800 |
| commit | 37cd058adf025c4164bc88926b2608df40a0f5b9 (patch) | |
| tree | 8308f17d48837e97c4f945d2d4774db134f18ca8 /mail/mail-ops.c | |
| parent | b3b783f14644f1b736282649ad625a7ae2ea398e (diff) | |
| download | gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar.gz gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar.bz2 gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar.lz gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar.xz gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.tar.zst gsoc2013-evolution-37cd058adf025c4164bc88926b2608df40a0f5b9.zip | |
Bug #336337 - Send & receive dialog shows the default smtp server
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 63f7a90eb6..b65c7f3c59 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -445,9 +445,12 @@ static const gchar *resent_recipients[] = { CAMEL_RECIPIENT_TYPE_RESENT_BCC }; +struct _send_queue_msg; +static void report_status (struct _send_queue_msg *m, enum camel_filter_status_t status, gint pc, const gchar *desc, ...); + /* send 1 message to a specific transport */ static void -mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination, CamelFilterDriver *driver, CamelException *ex) +mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *uid, const gchar *destination, CamelFilterDriver *driver, CamelException *ex) { EAccount *account = NULL; const CamelInternetAddress *iaddr; @@ -499,6 +502,9 @@ mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination sent_folder_uri = g_strstrip(g_strdup(tmp)); } + /* let the dialog know the right account it is using; percentage is ignored */ + report_status (m, CAMEL_FILTER_STATUS_ACTION, 0, transport_url ? transport_url : destination); + /* Check for email sending */ from = (CamelAddress *) camel_internet_address_new (); resent_from = camel_medium_get_header (CAMEL_MEDIUM (message), "Resent-From"); @@ -741,7 +747,7 @@ send_queue_exec (struct _send_queue_msg *m) if (!m->cancel) camel_operation_progress (NULL, (i+1) * 100 / send_uids->len); - mail_send_message (m->queue, send_uids->pdata[i], m->destination, m->driver, &ex); + mail_send_message (m, m->queue, send_uids->pdata[i], m->destination, m->driver, &ex); if (camel_exception_is_set (&ex)) { if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ |