[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-162-gb8db458

ticho at claws-mail.org ticho at claws-mail.org
Fri Apr 13 20:26:54 CEST 2018


The branch, gtk3 has been updated
       via  b8db458023dd823e08fc8319870765749a98d5e0 (commit)
      from  06cd7d5ff519c5e42f42a31039da08da2a852eb4 (commit)

Summary of changes:
 src/compose.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit b8db458023dd823e08fc8319870765749a98d5e0
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Apr 13 20:25:37 2018 +0200

    Fix for e9f610a4f for the rare cases the privacy system has no error string ready.

diff --git a/src/compose.c b/src/compose.c
index a6eb6d0..931b3bb 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5238,11 +5238,13 @@ static void _display_queue_error(ComposeQueueResult val)
 			break;
 		case COMPOSE_QUEUE_ERROR_SIGNING_FAILED:
 			alertpanel_error(_("Could not queue message for sending:\n\n"
-						"Signature failed: %s"), privacy_get_error());
+						"Signature failed: %s"),
+					privacy_peek_error() ? privacy_get_error() : _("Unknown error"));
 			break;
 		case COMPOSE_QUEUE_ERROR_ENCRYPT_FAILED:
 			alertpanel_error(_("Could not queue message for sending:\n\n"
-						"Encryption failed: %s"), privacy_get_error());
+						"Encryption failed: %s"),
+					privacy_peek_error() ? privacy_get_error() : _("Unknown error"));
 			break;
 		case COMPOSE_QUEUE_ERROR_CHAR_CONVERSION:
 			alertpanel_error(_("Could not queue message for sending:\n\n"

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list