aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-09-29 09:56:39 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-09-29 09:56:39 +0800
commit686a7adc09478d6ceb1646b077d21ae0e488830b (patch)
treef0699f7d5b023a717e08c1eb8b342677c5851563
parentdf3d5547e5844226755dc81d17572221e1fa5955 (diff)
downloadgsoc2013-evolution-686a7adc09478d6ceb1646b077d21ae0e488830b.tar.gz
gsoc2013-evolution-686a7adc09478d6ceb1646b077d21ae0e488830b.tar.zst
gsoc2013-evolution-686a7adc09478d6ceb1646b077d21ae0e488830b.zip
Don't send the recipient data through smtp_get_email_addr_from_text - this
2000-09-28 Jeffrey Stedfast <fejj@helixcode.com> * providers/smtp/camel-smtp-transport.c (_send_to): Don't send the recipient data through smtp_get_email_addr_from_text - this is a complete waste. In fact, we don't want to have to use that function ever. * camel-internet-address.c, camel-address.c: Added some gtk-doc comments. svn path=/trunk/; revision=5629
-rw-r--r--camel/ChangeLog10
-rw-r--r--camel/camel-internet-address.c6
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c29
3 files changed, 27 insertions, 18 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8d74db275f..554d22eb2a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,15 @@
2000-09-28 Jeffrey Stedfast <fejj@helixcode.com>
+ * providers/smtp/camel-smtp-transport.c (_send_to): Don't send the
+ recipient data through smtp_get_email_addr_from_text - this is a
+ complete waste. In fact, we don't want to have to use that
+ function ever.
+
+ * camel-internet-address.c, camel-address.c: Added some gtk-doc
+ comments.
+
+2000-09-28 Jeffrey Stedfast <fejj@helixcode.com>
+
* camel-mime-utils.c (header_encode_string): Make sure to add the
space char after an encoded word when the encoding is iso-8859-1.
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
index fe5729280e..7f15c242a6 100644
--- a/camel/camel-internet-address.c
+++ b/camel/camel-internet-address.c
@@ -165,7 +165,7 @@ camel_internet_address_new (void)
/**
* camel_internet_address_add:
- * @a:
+ * @a: internet address object
* @name:
* @address:
*
@@ -192,8 +192,8 @@ camel_internet_address_add (CamelInternetAddress *a, const char *name, const cha
/**
* camel_internet_address_get:
- * @a:
- * @index:
+ * @a: internet address object
+ * @index: address's array index
* @namep: Holder for the returned name, or NULL, if not required.
* @addressp: Holder for the returned address, or NULL, if not required.
*
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index a1961a5c9d..253e5c5319 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -65,10 +65,12 @@ static GList *query_auth_types_connected (CamelService *service, CamelException
static GList *query_auth_types_generic (CamelService *service, CamelException *ex);
static void free_auth_types (CamelService *service, GList *authtypes);
static char *get_name (CamelService *service, gboolean brief);
+
static gchar *smtp_get_email_addr_from_text (gchar *text);
+
static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);
-static gboolean smtp_mail (CamelSmtpTransport *transport, gchar *sender, CamelException *ex);
-static gboolean smtp_rcpt (CamelSmtpTransport *transport, gchar *recipient, CamelException *ex);
+static gboolean smtp_mail (CamelSmtpTransport *transport, const char *sender, CamelException *ex);
+static gboolean smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex);
static gboolean smtp_data (CamelSmtpTransport *transport, CamelMedium *message, CamelException *ex);
static gboolean smtp_rset (CamelSmtpTransport *transport, CamelException *ex);
static gboolean smtp_quit (CamelSmtpTransport *transport, CamelException *ex);
@@ -340,12 +342,11 @@ static gboolean
_send_to (CamelTransport *transport, CamelMedium *message,
GList *recipients, CamelException *ex)
{
- GList *r;
- gchar *recipient, *s, *sender;
- guint i, len;
CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);
+ char *recipient, *s, *sender;
+ GList *r;
- s = g_strdup(camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)));
+ s = g_strdup (camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)));
if (!s) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"Cannot send message: "
@@ -358,15 +359,15 @@ _send_to (CamelTransport *transport, CamelMedium *message,
g_free (sender);
g_free (s);
- if (!(len = g_list_length (recipients))) {
+ if (!recipients) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"Cannot send message: "
"no recipients defined.");
return FALSE;
}
- for (i = 0, r = recipients; i < len; i++, r = r->next) {
- recipient = smtp_get_email_addr_from_text (r->data);
+ for (r = recipients; r; r = r->next) {
+ recipient = (char *) r->data;
if (!smtp_rcpt (smtp_transport, recipient, ex)) {
g_free (recipient);
return FALSE;
@@ -384,8 +385,7 @@ _send_to (CamelTransport *transport, CamelMedium *message,
}
static gboolean
-_send (CamelTransport *transport, CamelMedium *message,
- CamelException *ex)
+_send (CamelTransport *transport, CamelMedium *message, CamelException *ex)
{
const CamelInternetAddress *to, *cc, *bcc;
GList *recipients = NULL;
@@ -565,7 +565,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
}
static gboolean
-smtp_mail (CamelSmtpTransport *transport, gchar *sender, CamelException *ex)
+smtp_mail (CamelSmtpTransport *transport, const char *sender, CamelException *ex)
{
/* we gotta tell the smtp server who we are. (our email addy) */
gchar *cmdbuf, *respbuf = NULL;
@@ -606,7 +606,7 @@ smtp_mail (CamelSmtpTransport *transport, gchar *sender, CamelException *ex)
}
static gboolean
-smtp_rcpt (CamelSmtpTransport *transport, gchar *recipient, CamelException *ex)
+smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex)
{
/* we gotta tell the smtp server who we are going to be sending
* our email to */
@@ -769,8 +769,7 @@ smtp_rset (CamelSmtpTransport *transport, CamelException *ex)
if (!respbuf || strncmp (respbuf, "250", 3)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "RSET response error: "
- "%s",
+ "RSET response error: %s",
g_strerror (errno));
return FALSE;
}