[Commits] [SCM] claws branch, master, updated. 4.1.1-74-gd832b62d7

[paul at claws-mail.org]

The branch, master has been updated
       via  d832b62d7b4044e00ea5c3d035f18d2a05289301 (commit)
      from  9eb64a780e6761f43e1378dde784c3466f2059ba (commit)

Summary of changes:
 src/prefs_themes.c |  5 ++---
 src/stock_pixmap.c | 21 +--------------------
 src/stock_pixmap.h |  3 +--
 3 files changed, 4 insertions(+), 25 deletions(-)


- Log -----------------------------------------------------------------
commit d832b62d7b4044e00ea5c3d035f18d2a05289301
Author: Paul <paul at claws-mail.org>
Date:   Fri Aug 18 11:45:52 2023 +0100

    fix bug 4693, 'Hang and crash when enable disable SVG Rendering prefs' by reverting d6dfb9960cc1c8d25a1dbfaf6958fb82e596c46b

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 5e0147ec8..8c7ed4e7a 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2022 the Claws Mail team
+ * Copyright (C) 2003-2023 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1362,8 +1362,7 @@ static void prefs_themes_save(PrefsPage *page)
 				&& scaling_ppi != prefs_common.pixmap_scaling_ppi)) {
 		/* same theme, different scaling options */
 		debug_print("Updating theme scaling\n");
-		stock_pixmap_invalidate_all_icons();
-		main_window_reflect_prefs_all_real(TRUE);
+		main_window_reflect_prefs_all_real(FALSE);
 		compose_reflect_prefs_pixmap_theme();
 		addrcompl_reflect_prefs_pixmap_theme();
 	}
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index b41532994..44dcdb72d 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -903,25 +903,6 @@ void stock_pixmap_themes_list_free(GList *list)
 	g_list_free(list);
 }
 
-void stock_pixmap_invalidate_all_icons(void)
-{
-	StockPixmapData *pix_d;
-	int i = 0;
-
-	while (i < N_STOCK_PIXMAPS) {
-		pix_d = &pixmaps[i];
-		if (pix_d->pixbuf) {
-			g_object_unref(G_OBJECT(pix_d->pixbuf));
-			pix_d->pixbuf = NULL;
-		}
-		if (pix_d->pixmap) {
-			g_object_unref(G_OBJECT(pix_d->pixmap));
-			pix_d->pixmap = NULL;
-		}
-		i++;
-	}
-}
-
 gchar *stock_pixmap_get_name (StockPixmap icon)
 {
 	if (icon >= N_STOCK_PIXMAPS)
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 35565933a..2d93e40d9 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -250,7 +250,6 @@ gint stock_pixbuf_gdk		(StockPixmap icon, GdkPixbuf **pixbuf);
 
 GList *stock_pixmap_themes_list_new	(void);
 void stock_pixmap_themes_list_free	(GList *list);
-void stock_pixmap_invalidate_all_icons	(void);
 gchar *stock_pixmap_get_name         (StockPixmap icon);
 StockPixmap stock_pixmap_get_icon    (gchar *file);
 GtkWidget *stock_pixmap_widget_with_overlay (StockPixmap	 icon,

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


hooks/post-receive
-- 
Claws Mail