From 6ae1b3fe3c4dfd391de92bfca42e44ff7cc8fe19 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 12 May 2011 16:57:37 -0400
Subject: em_utils_reply_to_message(): Require a CamelMimeMessage.

No more fetching a message itself.  Oh, and stop unreffing the message.
Those kinds of insane semantics are what lead to crashes.
---
 modules/mail/e-mail-attachment-handler.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'modules/mail/e-mail-attachment-handler.c')

diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index a11515bd3b..befac08d30 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -115,12 +115,9 @@ mail_attachment_handler_reply_all (GtkAction *action,
 	shell_settings = e_shell_get_shell_settings (priv->shell);
 	style = e_shell_settings_get_int (shell_settings, property_name);
 
-	/* em_utils_reply_to_message() unrefs 'message', thus ref it here */
-	g_object_ref (wrapper);
-
 	em_utils_reply_to_message (
-		priv->shell, NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
-		E_MAIL_REPLY_TO_ALL, style, NULL);
+		priv->shell, CAMEL_MIME_MESSAGE (wrapper),
+		NULL, NULL, E_MAIL_REPLY_TO_ALL, style, NULL);
 
 	g_list_foreach (selected, (GFunc) g_object_unref, NULL);
 	g_list_free (selected);
@@ -154,12 +151,9 @@ mail_attachment_handler_reply_sender (GtkAction *action,
 	shell_settings = e_shell_get_shell_settings (priv->shell);
 	style = e_shell_settings_get_int (shell_settings, property_name);
 
-	/* em_utils_reply_to_message() unrefs 'message', thus ref it here */
-	g_object_ref (wrapper);
-
 	em_utils_reply_to_message (
-		priv->shell, NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
-		E_MAIL_REPLY_TO_SENDER, style, NULL);
+		priv->shell, CAMEL_MIME_MESSAGE (wrapper),
+		NULL, NULL, E_MAIL_REPLY_TO_SENDER, style, NULL);
 
 	g_list_foreach (selected, (GFunc) g_object_unref, NULL);
 	g_list_free (selected);
-- 
cgit