[Commits] [SCM] claws branch, master, updated. 3.17.8-19-gaa522745c

[paul at claws-mail.org]

The branch, master has been updated
       via  aa522745ce21f016556b82c7dff06ee095a43381 (commit)
      from  ebb4a6041273bbaeab92e856d3a09f95c4a0bd43 (commit)

Summary of changes:
 src/plugins/pgpcore/pgp_viewer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit aa522745ce21f016556b82c7dff06ee095a43381
Author: Paul <paul at claws-mail.org>
Date:   Fri Jan 29 09:20:16 2021 +0000

    fix WM's X button causing key fetch attempt

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 83a4942e2..92ea643b9 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -195,7 +195,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 			TEXTVIEW_INSERT(cmd_ks);
 			TEXTVIEW_INSERT("\n\n");
 			TEXTVIEW_INSERT(cmd_wkd);
-		} else {
+		} else if (val == G_ALERTALTERNATE || val == G_ALERTOTHER) {
 			TEXTVIEW_INSERT(_("\n  Importing key ID "));
 			TEXTVIEW_INSERT(sig->fpr);
 			TEXTVIEW_INSERT(":\n\n");
@@ -293,7 +293,6 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 		g_free(cmd_ks);
 		g_free(cmd_wkd);
 		g_free(from_addr);
-		return;
 	} else {
 		TEXTVIEW_INSERT(_("\n  Key ID "));
 

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


hooks/post-receive
-- 
Claws Mail