diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-01-16 03:22:14 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-01-16 03:22:14 +0800 |
| commit | b238693b64aa877efe1d0d09aa8129748be095ed (patch) | |
| tree | 96b6a2ba9ddc58a653f0d03564b3faa8d77d5583 /camel/providers/smtp/camel-smtp-transport.c | |
| parent | 811c9c4acdc308b55d38dda2fda2e30433cd5e5b (diff) | |
| download | gsoc2013-evolution-b238693b64aa877efe1d0d09aa8129748be095ed.tar.gz gsoc2013-evolution-b238693b64aa877efe1d0d09aa8129748be095ed.tar.zst gsoc2013-evolution-b238693b64aa877efe1d0d09aa8129748be095ed.zip | |
Updated to match the new send_to API. (smtp_send): Get the from address
2002-01-15 Jeffrey Stedfast <fejj@ximian.com>
* providers/smtp/camel-smtp-transport.c (smtp_send_to): Updated to
match the new send_to API.
(smtp_send): Get the from address and pass that along to
smtp_send_to().
* providers/sendmail/camel-sendmail-transport.c
(sendmail_send_to): Updated to match the new send_to API.
* camel-transport.c (camel_transport_send_to): Now takes a from
argument too.
svn path=/trunk/; revision=15328
Diffstat (limited to 'camel/providers/smtp/camel-smtp-transport.c')
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 71bd1d8776..c54e0821d8 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -70,7 +70,7 @@ static gboolean smtp_can_send (CamelTransport *transport, CamelMedium *message); static gboolean smtp_send (CamelTransport *transport, CamelMedium *message, CamelException *ex); static gboolean smtp_send_to (CamelTransport *transport, CamelMedium *message, - CamelAddress *recipients, CamelException *ex); + CamelAddress *from, CamelAddress *recipients, CamelException *ex); /* support prototypes */ static void smtp_construct (CamelService *service, CamelSession *session, @@ -567,7 +567,8 @@ smtp_can_send (CamelTransport *transport, CamelMedium *message) static gboolean smtp_send_to (CamelTransport *transport, CamelMedium *message, - CamelAddress *recipients, CamelException *ex) + CamelAddress *from, CamelAddress *recipients, + CamelException *ex) { CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport); const CamelInternetAddress *cia; @@ -575,15 +576,14 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message, const char *addr; int i, len; - cia = camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)); - if (!cia) { + if (!from) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot send message: " "sender address not defined.")); return FALSE; } - if (!camel_internet_address_get (cia, 0, NULL, &addr)) { + if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (from), 0, NULL, &addr)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot send message: " "sender address not valid.")); @@ -642,10 +642,12 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message, static gboolean smtp_send (CamelTransport *transport, CamelMedium *message, CamelException *ex) { - const CamelInternetAddress *to, *cc, *bcc; + const CamelInternetAddress *from, *to, *cc, *bcc; CamelInternetAddress *recipients = NULL; gboolean status; + from = camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)); + to = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_TO); cc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_CC); bcc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_BCC); @@ -655,7 +657,7 @@ smtp_send (CamelTransport *transport, CamelMedium *message, CamelException *ex) camel_address_cat (CAMEL_ADDRESS (recipients), CAMEL_ADDRESS (cc)); camel_address_cat (CAMEL_ADDRESS (recipients), CAMEL_ADDRESS (bcc)); - status = smtp_send_to (transport, message, CAMEL_ADDRESS (recipients), ex); + status = smtp_send_to (transport, message, CAMEL_ADDRESS (from), CAMEL_ADDRESS (recipients), ex); camel_object_unref (CAMEL_OBJECT (recipients)); |