diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-08-14 08:49:46 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-08-14 08:56:33 +0800 |
| commit | 6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f (patch) | |
| tree | 8ac6832a905017845b3095112b83bb14da112617 /modules/mail/e-mail-attachment-handler.c | |
| parent | caed9460b2d518005abe34035d5b414ff07c0212 (diff) | |
| download | gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.gz gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.zst gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.zip | |
Pass an EShell to EMsgComposer instances.
Reduce the composer's dependency on e_shell_get_default().
Diffstat (limited to 'modules/mail/e-mail-attachment-handler.c')
| -rw-r--r-- | modules/mail/e-mail-attachment-handler.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index 3240c560de..313dddeac4 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -59,11 +59,15 @@ static void mail_attachment_handler_forward (GtkAction *action, EAttachmentView *view) { + EShell *shell; EAttachment *attachment; CamelMimePart *mime_part; CamelDataWrapper *wrapper; GList *selected; + /* FIXME Pass this in somehow. */ + shell = e_shell_get_default (); + selected = e_attachment_view_get_selected_attachments (view); g_return_if_fail (g_list_length (selected) == 1); @@ -71,7 +75,7 @@ mail_attachment_handler_forward (GtkAction *action, mime_part = e_attachment_get_mime_part (attachment); wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); - em_utils_forward_message (CAMEL_MIME_MESSAGE (wrapper), NULL); + em_utils_forward_message (shell, CAMEL_MIME_MESSAGE (wrapper), NULL); g_list_foreach (selected, (GFunc) g_object_unref, NULL); g_list_free (selected); @@ -81,11 +85,15 @@ static void mail_attachment_handler_reply_all (GtkAction *action, EAttachmentView *view) { + EShell *shell; EAttachment *attachment; CamelMimePart *mime_part; CamelDataWrapper *wrapper; GList *selected; + /* FIXME Pass this in somehow. */ + shell = e_shell_get_default (); + selected = e_attachment_view_get_selected_attachments (view); g_return_if_fail (g_list_length (selected) == 1); @@ -94,7 +102,7 @@ mail_attachment_handler_reply_all (GtkAction *action, wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); em_utils_reply_to_message ( - NULL, NULL, CAMEL_MIME_MESSAGE (wrapper), + shell, NULL, NULL, CAMEL_MIME_MESSAGE (wrapper), REPLY_MODE_ALL, NULL); g_list_foreach (selected, (GFunc) g_object_unref, NULL); @@ -105,11 +113,15 @@ static void mail_attachment_handler_reply_sender (GtkAction *action, EAttachmentView *view) { + EShell *shell; EAttachment *attachment; CamelMimePart *mime_part; CamelDataWrapper *wrapper; GList *selected; + /* FIXME Pass this in somehow. */ + shell = e_shell_get_default (); + selected = e_attachment_view_get_selected_attachments (view); g_return_if_fail (g_list_length (selected) == 1); @@ -118,7 +130,7 @@ mail_attachment_handler_reply_sender (GtkAction *action, wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); em_utils_reply_to_message ( - NULL, NULL, CAMEL_MIME_MESSAGE (wrapper), + shell, NULL, NULL, CAMEL_MIME_MESSAGE (wrapper), REPLY_MODE_SENDER, NULL); g_list_foreach (selected, (GFunc) g_object_unref, NULL); |