[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-250-g15814dd06

[wwp at claws-mail.org]

The branch, gtk3 has been updated
       via  15814dd06ce1461b1b52efc33ae6b0b7da7dd036 (commit)
      from  ced627e7504468adcde5011f1280aaea626fe79c (commit)

Summary of changes:
 src/plugins/pgpcore/passphrase.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 15814dd06ce1461b1b52efc33ae6b0b7da7dd036
Author: wwp <subscript at free.fr>
Date:   Tue Sep 28 17:07:13 2021 +0200

    Fix CID 1491150: resource leaks.

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index eabaee7b2..223b245eb 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -256,23 +256,18 @@ create_description(const gchar *uid_hint, gint prev_bad, gint new_key)
     	*(strchr(my_uid, '>')) = ')';
 
     if (new_key == 1) {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
-					_("Please enter the passphrase for the new key:"),
-					"</span>\n\n%.*s\n", NULL),
-                           prev_bad ?
-                           _("Passphrases did not match.\n") : "",
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s%s</span>\n\n%.*s\n",
+                           prev_bad ? _("Passphrases did not match.\n") : "",
+                           _("Please enter the passphrase for the new key:"),
                            linelen (my_uid), my_uid);
     } else if (new_key == 2) {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">",
-				_("Please re-enter the passphrase for the new key:"),
-				"</span>\n\n%.*s\n", NULL),
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%.*s\n",
+                           _("Please re-enter the passphrase for the new key:"),
                            linelen (my_uid), my_uid);
     } else {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
-				_("Please enter the passphrase for:"),
-				"</span>\n\n%.*s\n", NULL),
-                           prev_bad ?
-                           _("Bad passphrase.\n") : "",
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s%s</span>\n\n%.*s\n",
+                           prev_bad ? _("Bad passphrase.\n") : "",
+                           _("Please enter the passphrase for:"),
                            linelen (my_uid), my_uid);
     }
     g_free(my_uid);

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


hooks/post-receive
-- 
Claws Mail