diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-05-07 05:54:37 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-05-07 05:54:37 +0800 |
| commit | b254ea37eff47973b076fcf9345f80215ae5c978 (patch) | |
| tree | 6a3c594988e168ee938f73adb4c13319c52f2616 /mail/em-composer-utils.c | |
| parent | 9567024148976a663585894ccef76d729f0fb095 (diff) | |
| download | gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar.gz gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar.bz2 gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar.lz gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar.xz gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.tar.zst gsoc2013-evolution-b254ea37eff47973b076fcf9345f80215ae5c978.zip | |
Bug #301323 - "Edit as new message" doesn't strip signature properly
Diffstat (limited to 'mail/em-composer-utils.c')
| -rw-r--r-- | mail/em-composer-utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 64e1e2deed..cf5039b9fd 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -81,6 +81,7 @@ struct _AsyncContext { gchar *folder_uri; gchar *message_uid; gboolean replace; + gboolean keep_signature; GtkWidget *destroy_when_done; }; @@ -1336,7 +1337,8 @@ GtkWidget * em_utils_edit_message (EShell *shell, CamelFolder *folder, CamelMimeMessage *message, - const gchar *message_uid) + const gchar *message_uid, + gboolean keep_signature) { EMsgComposer *composer; ESourceRegistry *registry; @@ -1377,7 +1379,7 @@ em_utils_edit_message (EShell *shell, g_slist_free (clue_list); } - composer = e_msg_composer_new_with_message (shell, message, NULL); + composer = e_msg_composer_new_with_message (shell, message, keep_signature, NULL); if (!folder_is_templates) { EComposerHeaderTable *table; ESource *source; @@ -1483,7 +1485,7 @@ edit_messages_cb (CamelFolder *folder, message = CAMEL_MIME_MESSAGE (value); camel_medium_remove_header (CAMEL_MEDIUM (value), "X-Mailer"); - em_utils_edit_message (shell, folder, message, key); + em_utils_edit_message (shell, folder, message, key, context->keep_signature); } g_hash_table_unref (hash_table); @@ -1506,7 +1508,8 @@ void em_utils_edit_messages (EMailReader *reader, CamelFolder *folder, GPtrArray *uids, - gboolean replace) + gboolean replace, + gboolean keep_signature) { EActivity *activity; AsyncContext *context; @@ -1524,6 +1527,7 @@ em_utils_edit_messages (EMailReader *reader, context->reader = g_object_ref (reader); context->ptr_array = g_ptr_array_ref (uids); context->replace = replace; + context->keep_signature = keep_signature; e_mail_folder_get_multiple_messages ( folder, uids, G_PRIORITY_DEFAULT, |