diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6fc1517054..93a3cd023e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2005-04-08 Jeffrey Stedfast <fejj@novell.com> + + * em-composer-utils.c (em_utils_send_receipt): Simplify the + scanning for '@' by using strchr(). + 2005-04-08 Not Zed <NotZed@Ximian.com> * em-composer-utils.c (em_utils_ask_receipt): removed. @@ -225,8 +230,8 @@ 2005-02-25 Mengjie Yu <meng-jie.yu@sun.com> - * em-folder-browser.c: (emfb_edit_select_all):make the 'select all' - work in all conditions. + * em-folder-browser.c (emfb_edit_select_all): make the 'select + all' work in all conditions. Fixes #72545 @@ -288,7 +293,7 @@ 2005-02-22 Marco Pesenti Gritti <marco@gnome.org> - * mail/em-popup.c: (emp_apps_open_in), (emp_standard_menu_factory): + * mail/em-popup.c (emp_apps_open_in, emp_standard_menu_factory): Use gnome-vfs API to launch external applications 2005-02-22 Not Zed <NotZed@Ximian.com> 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) |