From a1dbf7e2b8b79455eedec53cc9f2221e97215a9f Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 9 Aug 2001 22:48:12 +0000 Subject: A quoted string cannot contain \n's so check for those as well. 2001-08-09 Jeffrey Stedfast * providers/imap/camel-imap-utils.c (imap_parse_string_generic): A quoted string cannot contain \n's so check for those as well. (imap_atom_specials): Update this to fix bug #6553. svn path=/trunk/; revision=11845 --- camel/providers/smtp/camel-smtp-transport.c | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'camel/providers/smtp/camel-smtp-transport.c') diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 92d0abc9b0..f7749f4216 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -590,8 +590,8 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message, "sender address not valid.")); return FALSE; } - - camel_operation_start(NULL, _("Sending message")); + + camel_operation_start (NULL, _("Sending message")); /* find out if the message has 8bit mime parts */ has_8bit_parts = camel_mime_message_has_8bit_parts (CAMEL_MIME_MESSAGE (message)); @@ -612,7 +612,7 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message, recipient = (char *) r->data; if (!smtp_rcpt (smtp_transport, recipient, ex)) { g_free (recipient); - camel_operation_end(NULL); + camel_operation_end (NULL); return FALSE; } g_free (recipient); @@ -622,14 +622,14 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message, recurse through the message all over again if the user is not sending 8bit mime parts */ if (!smtp_data (smtp_transport, message, has_8bit_parts, ex)) { - camel_operation_end(NULL); + camel_operation_end (NULL); return FALSE; } /* reset the service for our next transfer session */ smtp_rset (smtp_transport, ex); - - camel_operation_end(NULL); + + camel_operation_end (NULL); return TRUE; } @@ -682,8 +682,8 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex) gchar *cmdbuf, *respbuf = NULL; struct hostent *host; - camel_operation_start_transient(NULL, _("SMTP Greeting")); - + camel_operation_start_transient (NULL, _("SMTP Greeting")); + /* get the local host name */ host = gethostbyaddr ((gchar *)&transport->localaddr.sin_addr, sizeof (transport->localaddr.sin_addr), AF_INET); @@ -706,7 +706,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex) camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("HELO request timed out: %s: non-fatal"), g_strerror (errno)); - camel_operation_end(NULL); + camel_operation_end (NULL); return FALSE; } g_free (cmdbuf); @@ -726,7 +726,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex) camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("HELO response error: %s: non-fatal"), get_smtp_error_string (error)); - camel_operation_end(NULL); + camel_operation_end (NULL); return FALSE; } @@ -744,8 +744,8 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex) } } while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */ g_free (respbuf); - - camel_operation_end(NULL); + + camel_operation_end (NULL); return TRUE; } @@ -754,19 +754,19 @@ static gboolean smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex) { gchar *cmdbuf, *respbuf = NULL, *challenge; - CamelSasl *sasl; - - camel_operation_start_transient(NULL, _("SMTP Authentication")); - + CamelSasl *sasl = NULL; + + camel_operation_start_transient (NULL, _("SMTP Authentication")); + sasl = camel_sasl_new ("smtp", mech, CAMEL_SERVICE (transport)); if (!sasl) { - camel_operation_end(NULL); + camel_operation_end (NULL); camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Error creating SASL authentication object.")); return FALSE; } - - challenge = camel_sasl_challenge_base64(sasl, NULL, ex); + + challenge = camel_sasl_challenge_base64 (sasl, NULL, ex); if (challenge) { cmdbuf = g_strdup_printf ("AUTH %s %s\r\n", mech, challenge); g_free (challenge); @@ -830,10 +830,10 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex) g_free (respbuf); goto lose; } - - camel_object_unref((CamelObject *)sasl); - camel_operation_end(NULL); - + + camel_object_unref (CAMEL_OBJECT (sasl)); + camel_operation_end (NULL); + return TRUE; break_and_lose: @@ -850,7 +850,7 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex) } camel_object_unref (CAMEL_OBJECT (sasl)); - camel_operation_end(NULL); + camel_operation_end (NULL); return FALSE; } -- cgit v1.2.3