From 55bead18b69fd4e7ad2b09700867add2ca7e9838 Mon Sep 17 00:00:00 2001 From: Meilof Veeningen Date: Fri, 12 Nov 2004 05:03:07 +0000 Subject: Added author tag, fixed description, removed "plugin" from name, changed 2004-11-04 Meilof Veeningen * org-gnome-mailing-list-actions.eplug.in: Added author tag, fixed description, removed "plugin" from name, changed position of item in popup menu, using "enable" rather than "visible" for bonobo menus * org-gnome-mailing-list-actions.xml: Now place menus in MailMessageActions placeholder; moved label to section * org-gnome-mailing-list-actions-errors.xml: fixed button order: "Cancel" now leftmost button; added e-mail address to send confirm dialog * mailing-list-actions.c: account guessing now first based on message; added e-mail address to send confirm dialog svn path=/trunk/; revision=27897 --- plugins/mailing-list-actions/ChangeLog | 16 ++++++++ .../mailing-list-actions/mailing-list-actions.c | 23 +++++++---- .../org-gnome-mailing-list-actions-errors.xml | 6 +-- .../org-gnome-mailing-list-actions-errors.xml.h | 4 +- .../org-gnome-mailing-list-actions.eplug.in | 46 +++++++++++----------- .../org-gnome-mailing-list-actions.xml | 32 ++++++++------- 6 files changed, 78 insertions(+), 49 deletions(-) (limited to 'plugins/mailing-list-actions') diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog index 60f4d154ab..1a91a30939 100644 --- a/plugins/mailing-list-actions/ChangeLog +++ b/plugins/mailing-list-actions/ChangeLog @@ -1,3 +1,19 @@ +2004-11-04 Meilof Veeningen + + * org-gnome-mailing-list-actions.eplug.in: Added author tag, fixed + description, removed "plugin" from name, changed position of item + in popup menu, using "enable" rather than "visible" for bonobo menus + + * org-gnome-mailing-list-actions.xml: Now place menus in + MailMessageActions placeholder; moved label to section + + * org-gnome-mailing-list-actions-errors.xml: fixed button order: + "Cancel" now leftmost button; added e-mail address to send confirm + dialog + + * mailing-list-actions.c: account guessing now first based on message; + added e-mail address to send confirm dialog + 2004-11-09 Rodney Dawes * Makefile.am: Add org-gnome-mailing-list-actions.xml to EXTRA_DIST diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index c8fbddb971..c8b0e15ea8 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -95,13 +95,13 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage { emla_action_data *action_data = (emla_action_data *) data; EmlaAction action = action_data->action; - const char* header = NULL, *headerpos; + const char* header = NULL, *headerpos, *fromurl = NULL; char *end, *url = NULL; int t; GError *err; EMsgComposer *composer; int send_message_response; - EAccount *account; + EAccount *account = NULL; for (t = 0; t < emla_n_action_headers; t++) { if (emla_action_headers[t].action == action && @@ -140,20 +140,29 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage url[end-headerpos] = '\0'; if (strncmp (url, "mailto:", 6) == 0) { - if (emla_action_headers[t].interactive) + if (emla_action_headers[t].interactive) { send_message_response = GTK_RESPONSE_NO; - else - send_message_response = e_error_run (NULL, "org.gnome.mailing-list-actions:ask-send-message", url, NULL); + } else { + fromurl = camel_mime_message_get_source (msg); + account = mail_config_get_account_by_source_url (fromurl); + if (!account) { + fromurl = action_data->uri; + account = mail_config_get_account_by_source_url (fromurl); + } + send_message_response = e_error_run (NULL, "org.gnome.mailing-list-actions:ask-send-message", + (account && account->id && account->id->address) ? account->id->address : "(default e-mail)", + url, NULL); + } if (send_message_response == GTK_RESPONSE_YES) { /* directly send message */ composer = e_msg_composer_new_from_url (url); - if ((account = mail_config_get_account_by_source_url (action_data->uri))) + if (account) e_msg_composer_hdrs_set_from_account ((EMsgComposerHdrs *) composer->hdrs, account->name); em_utils_composer_send_cb (composer, NULL); } else if (send_message_response == GTK_RESPONSE_NO) { /* show composer */ - em_utils_compose_new_message_with_mailto (url, action_data->uri); + em_utils_compose_new_message_with_mailto (url, fromurl); } goto exit; diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml b/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml index 69b20fa834..2a7192638f 100644 --- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml +++ b/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml @@ -13,12 +13,12 @@ Send e-mail message to mailing list? - An e-mail message will be sent to the URL "{0}". You can either send the message automatically, or see and change it first. + An e-mail message will be sent to the URL "{1}", using the e-mail address "{0}". You can either send the message automatically, or see and change it first. You should receive an answer from the mailing list shortly after the message has been sent. -