callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to match the new send_to API. (smtp_send): Get the from address

Browse Source 
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
This commit is contained in:
Jeffrey Stedfast
2002-01-15 19:22:14 +00:00
committed by Jeffrey Stedfast
parent 811c9c4acd
commit b238693b64
5 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
camel/ChangeLog
View File

@ -1,5 +1,16 @@
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.
* providers/imap/camel-imap-folder.c (imap_update_summary): Sort
the needheaders UID array and fixed to respect the
UID_SET_LIMIT. This should now finish the fixification of bug

6
camel/camel-transport.c
View File

@ -122,6 +122,7 @@ camel_transport_send (CamelTransport *transport, CamelMedium *message,
* camel_transport_send_to: Send a message non-standard recipients
* @transport: the transport
* @message: the message
* @from: from address
* @recipients: the recipients
* @ex: a CamelException
*
@ -132,7 +133,8 @@ camel_transport_send (CamelTransport *transport, CamelMedium *message,
**/
gboolean
camel_transport_send_to (CamelTransport *transport, CamelMedium *message,
CamelAddress *recipients, CamelException *ex)
CamelAddress *from, CamelAddress *recipients,
CamelException *ex)
{
gboolean sent;
@ -140,7 +142,7 @@ camel_transport_send_to (CamelTransport *transport, CamelMedium *message,
CAMEL_TRANSPORT_LOCK (transport, send_lock);
sent = CT_CLASS (transport)->send_to (transport, message,
recipients, ex);
from, recipients, ex);
CAMEL_TRANSPORT_UNLOCK (transport, send_lock);
return sent;

5
camel/camel-transport.h
View File

@ -60,7 +60,8 @@ typedef struct {
gboolean (*send) (CamelTransport *transport, CamelMedium *message,
CamelException *ex);
gboolean (*send_to) (CamelTransport *transport, CamelMedium *message,
CamelAddress *recipients, CamelException *ex);
CamelAddress *from, CamelAddress *recipients,
CamelException *ex);
} CamelTransportClass;
@ -72,9 +73,9 @@ gboolean camel_transport_send (CamelTransport *transport,
CamelMedium *message,
CamelException *ex);
/* FIXME: This should use a camel-address */
gboolean camel_transport_send_to (CamelTransport *transport,
CamelMedium *message,
CamelAddress *from,
CamelAddress *recipients,
CamelException *ex);

14
camel/providers/sendmail/camel-sendmail-transport.c
View File

@ -45,7 +45,8 @@ static gboolean sendmail_can_send (CamelTransport *transport, CamelMedium *messa
static gboolean sendmail_send (CamelTransport *transport, CamelMedium *message,
CamelException *ex);
static gboolean sendmail_send_to (CamelTransport *transport, CamelMedium *message,
CamelAddress *recipients, CamelException *ex);
CamelAddress *from, CamelAddress *recipients,
CamelException *ex);
static void
@ -198,22 +199,25 @@ get_from (CamelMedium *message, CamelException *ex)
static gboolean
sendmail_send_to (CamelTransport *transport, CamelMedium *message,
CamelAddress *recipients, CamelException *ex)
CamelAddress *from, CamelAddress *recipients,
CamelException *ex)
{
const char *from, *addr, **argv;
const char *from_addr, *addr, **argv;
gboolean status;
int i, len;
from = get_from (message, ex);
if (!from)
return FALSE;
if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (from), 0, NULL, &from_addr))
return FALSE;
len = camel_address_length (recipients);
argv = g_malloc ((len + 6) * sizeof (char *));
argv[0] = "sendmail";
argv[1] = "-i";
argv[2] = "-f";
argv[3] = from;
argv[3] = from_addr;
argv[4] = "--";
for (i = 0; i < len; i++) {

16
camel/providers/smtp/camel-smtp-transport.c
View File

@ -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));