File Do-not-use-msginfo_list-for-compose.patch of Package claws-mail

Overview Repositories Revisions Requests Users Attributes Meta

File Do-not-use-msginfo_list-for-compose.patch of Package claws-mail (Revision 61bd3862a4bae46495ae8530c0e4b1f8)

Currently displaying revision 61bd3862a4bae46495ae8530c0e4b1f8 , Show latest

From f95bd79b9abd7158cd1c03bd85ea5863196625e4 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <hramrach@gmail.com>
Date: Mon, 9 Oct 2017 10:15:44 +0200
Subject: [PATCH] When composing body is always taken from message view so do
 not pretend reply to mesages from summary is possible.

The only code to convert a msginfo to message text is in
messageview_show. The msginfo_list passed to
compose_reply_from_messageview serves no purpose since the repl;y body
is always taken from the messageview. In order to be able to reply to
massages from summary view and notifications compose_reply_from_msginfo
is needed.
---
 src/mainwindow.c | 2 +-
 src/toolbar.c    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 3d58e7cc9..07d0b331b 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4129,7 +4129,7 @@ static void main_window_reply_cb(GtkAction *gaction, gpointer data)
 
 	cm_return_if_fail(msgview != NULL);
 
-	msginfo_list = summary_get_selection(mainwin->summaryview);
+	msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
 	cm_return_if_fail(msginfo_list != NULL);
 	compose_reply_from_messageview(msgview, msginfo_list, action);
 	g_slist_free(msginfo_list);
diff --git a/src/toolbar.c b/src/toolbar.c
index 36263293d..002cfb9bb 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2960,19 +2960,17 @@ static void toolbar_reply(gpointer data, guint action)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow*)toolbar_item->parent;
-		msginfo_list = summary_get_selection(mainwin->summaryview);
 		msgview = (MessageView*)mainwin->messageview;
 		break;
 	case TOOLBAR_MSGVIEW:
 		msgview = (MessageView*)toolbar_item->parent;
-		cm_return_if_fail(msgview != NULL);	
-		msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
 		break;
 	default:
 		return;
 	}
 
 	cm_return_if_fail(msgview != NULL);
+	msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
 	cm_return_if_fail(msginfo_list != NULL);
 	compose_reply_from_messageview(msgview, msginfo_list, action);
 	g_slist_free(msginfo_list);
-- 
2.11.0

Places

File Do-not-use-msginfo_list-for-compose.patch of Package claws-mail (Revision 61bd3862a4bae46495ae8530c0e4b1f8)

Places