[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-214-g45bb7c40c

[jonathan at claws-mail.org]

The branch, gtk3 has been updated
       via  45bb7c40cc009d2c13244660ef21855dac48ca51 (commit)
       via  d5e5f0ce0c82ee9772235204e7c93415e234e254 (commit)
       via  a325902fc08410c8566f99b2ad6f89749a85675d (commit)
      from  4d563173977122b8e8a5d65ebb34d4a3050845d7 (commit)

Summary of changes:
 src/gtk/gtkutils.c           | 9 +++++++--
 src/plugins/pgpcore/sgpgme.c | 3 +--
 src/textview.c               | 9 +++++----
 3 files changed, 13 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 45bb7c40cc009d2c13244660ef21855dac48ca51
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Fri Sep 24 08:21:06 2021 -0700

    Fix memory leak

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 6302284fe..5a2c4a97c 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1077,6 +1077,8 @@ GtkWidget *xface_get_from_header(const gchar *o_xface)
 {
 	static gchar *xpm_xface[XPM_XFACE_HEIGHT];
 	static gboolean xpm_xface_init = TRUE;
+	GdkPixbuf *pixbuf;
+	GtkWidget *ret;
 	gchar xface[2048];
 	
 	if (o_xface == NULL)
@@ -1102,8 +1104,11 @@ GtkWidget *xface_get_from_header(const gchar *o_xface)
 
 	create_xpm_from_xface(xpm_xface, xface);
 
-	return gtk_image_new_from_pixbuf(
-		gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
+	pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface);
+	ret = gtk_image_new_from_pixbuf(pixbuf);
+	g_object_unref(pixbuf);
+
+	return ret;
 }
 #endif
 

commit d5e5f0ce0c82ee9772235204e7c93415e234e254
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Fri Sep 24 04:57:54 2021 -0700

    Fix memory leak

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index adba42c0c..b40b84087 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -401,8 +401,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 				key->uids = key->uids ? key->uids->next : NULL;
 				while (key->uids != NULL) {
 					g_string_append_printf(siginfo,
-						g_strconcat("                    ",
-							    _("uid \"%s\" (Validity: %s)\n"), NULL),
+						_("                    uid \"%s\" (Validity: %s)\n"),
 						key->uids->uid,
 						key->uids->revoked==TRUE?_("Revoked"):get_validity_str(key->uids->validity));
 					j++;

commit a325902fc08410c8566f99b2ad6f89749a85675d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Fri Sep 24 04:47:46 2021 -0700

    Fix memory leak

diff --git a/src/textview.c b/src/textview.c
index 40a9716d7..8c42c6dda 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2611,14 +2611,14 @@ static void textview_set_font_zoom(TextView *textview)
 	PangoFontDescription *font;
 	gint size;
 
+	/* do nothing if no zoom level has been set */
+	if (textview_font_size_percent == TEXTVIEW_FONT_SIZE_UNSET)
+		return;
+
 	font = pango_font_description_from_string
 						(prefs_common.textfont);
 	cm_return_if_fail(font);
 
-	/* do nothing is no zoom level has been set */
-	if (textview_font_size_percent == TEXTVIEW_FONT_SIZE_UNSET)
-		return;
-
 	if (textview_font_size_default == TEXTVIEW_FONT_SIZE_UNSET)
 		textview_font_size_default = pango_font_description_get_size(font);
 
@@ -2626,6 +2626,7 @@ static void textview_set_font_zoom(TextView *textview)
 
 	pango_font_description_set_size(font, size);
 	gtk_widget_override_font(textview->text, font);
+	pango_font_description_free(font);
 }
 
 static void textview_zoom(GtkWidget *widget, gboolean zoom_in)

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


hooks/post-receive
-- 
Claws Mail