From 9e95f43f157a0ba9fa52ca9b6f77134a62d9aa26 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 8 Apr 2005 17:48:45 +0000 Subject: Simplify the scanning for '@' by using strchr(). 2005-04-08 Jeffrey Stedfast * em-composer-utils.c (em_utils_send_receipt): Simplify the scanning for '@' by using strchr(). svn path=/trunk/; revision=29197 --- mail/em-composer-utils.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'mail/em-composer-utils.c') diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index c018337584..975d560ba8 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1135,9 +1135,7 @@ void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) { /* See RFC #2298 for a description of message receipts */ - EAccount *account = guess_account (message, folder); - CamelMimeMessage *receipt = camel_mime_message_new (); CamelMultipart *body = camel_multipart_new (); CamelMimePart *part; @@ -1160,13 +1158,12 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) return; /* Collect information for the receipt */ - + /* We use camel_header_msgid_generate () to get a canonical * hostname, then skip the part leading to '@' */ - fake_msgid = camel_header_msgid_generate (); - for (hostname = fake_msgid; hostname && *hostname != '@'; ++hostname); - ++hostname; - + hostname = strchr ((fake_msgid = camel_header_msgid_generate ()), '@'); + hostname++; + self_address = account->id->address; if (!message_id) -- cgit v1.2.3