[Commits] [SCM] claws branch, master, updated. 3.17.4-62-g5286b61fa

[colin at claws-mail.org]

The branch, master has been updated
       via  5286b61fa85f46ed353f68c65af30a187cbabaa1 (commit)
       via  10f541696bab3a95ad21d84846518eb30b6a4c45 (commit)
       via  73b4c7f5a0d307af6ef13bc7b5c900fce5a16002 (commit)
      from  6f1eb3954f61cf772fb24eea82b599cdcf7b0b56 (commit)

Summary of changes:
 src/messageview.c                       | 4 ++++
 src/mimeview.c                          | 8 ++++++++
 src/mimeview.h                          | 2 ++
 src/plugins/litehtml_viewer/lh_viewer.c | 2 --
 4 files changed, 14 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 5286b61fa85f46ed353f68c65af30a187cbabaa1
Merge: 10f541696 6f1eb3954
Author: Colin Leroy <colin at colino.net>
Date:   Sat Nov 9 22:48:39 2019 +0100

    Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws


commit 10f541696bab3a95ad21d84846518eb30b6a4c45
Author: Colin Leroy <colin at colino.net>
Date:   Sat Nov 9 22:47:55 2019 +0100

    Unplug LiteHtml's print callback which does nothing

diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index 03775dc78..cca94d5fa 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -154,8 +154,6 @@ MimeViewer *lh_viewer_create()
 
 	viewer->mimeviewer.clear_viewer = lh_clear_viewer;
 	viewer->mimeviewer.destroy_viewer = lh_destroy_viewer;
-	
-	viewer->mimeviewer.print = lh_print_viewer;
 
 	viewer->vbox = gtk_vbox_new(FALSE, 0);
 

commit 73b4c7f5a0d307af6ef13bc7b5c900fce5a16002
Author: Colin Leroy <colin at colino.net>
Date:   Sat Nov 9 22:45:17 2019 +0100

    Fix printing of empty pages when the selected part
    is rendered with a plugin not implementing print.

diff --git a/src/messageview.c b/src/messageview.c
index 2f7a8289f..b4fc18316 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2180,6 +2180,10 @@ static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gin
 			if (viewer && viewer->print) {
 				viewer->print(viewer);
 				return;
+			} else {
+				/* Force text rendering */
+				mimeview_show_part_as_text(mimeview,
+							   mimeview_get_selected_part(mimeview));
 			}
 		}
 		if (sel_start != -1 && sel_end != -1) {
diff --git a/src/mimeview.c b/src/mimeview.c
index bb14a60ec..28dd069ca 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1430,6 +1430,14 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
 	noticeview_show(mimeview->siginfoview);
 }
 
+void mimeview_show_part_as_text(MimeView *mimeview, MimeInfo *partinfo)
+{
+	cm_return_if_fail(mimeview != NULL);
+	cm_return_if_fail(partinfo != NULL);
+
+	mimeview_show_message_part(mimeview, partinfo);
+}
+
 static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
 {
 	GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
diff --git a/src/mimeview.h b/src/mimeview.h
index e520d55e4..2f87b8c3a 100644
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -147,6 +147,8 @@ void mimeview_show_message	(MimeView	*mimeview,
 				 const gchar	*file);
 gboolean mimeview_show_part	(MimeView 	*mimeview, 
 				 MimeInfo 	*partinfo);
+void mimeview_show_part_as_text (MimeView *mimeview,
+				 MimeInfo *partinfo);
 void mimeview_destroy		(MimeView	*mimeview);
 void mimeview_update		(MimeView 	*mimeview);
 void mimeview_clear		(MimeView	*mimeview);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail