fix a crash in fancy plugin
authorJonathan Boeing <jonathan.n.boeing@gmail.com>
Sun, 11 Jul 2021 22:32:39 +0000 (15:32 -0700)
committerJonathan Boeing <jonathan.n.boeing@gmail.com>
Sun, 11 Jul 2021 23:20:34 +0000 (16:20 -0700)
Makefile.am
patches/claws_mail/03-fancy-prefs.patch [new file with mode: 0755]

index d64aadf3526cc2beb38af3ba0c8ffe8f1646099d..9cc1b3ad8f0cadef7eb86f0c15815d425060ac46 100644 (file)
@@ -41,6 +41,7 @@ EXTRA_DIST = autogen.sh \
              patches/bzip2-1.0.8/02-g10-Makefile.patch \
              patches/claws_mail/01-etpan-sasl-plugin-path.patch \
              patches/claws_mail/02-define-WIN32-for-litehtml.patch \
+             patches/claws_mail/03-fancy-prefs.patch \
              patches/claws_mail/99-autogen.patch \
              patches/cyrus_sasl-2.1.27/01-md5-typedef.patch \
              patches/cyrus_sasl-2.1.27/02-tchar.patch \
diff --git a/patches/claws_mail/03-fancy-prefs.patch b/patches/claws_mail/03-fancy-prefs.patch
new file mode 100755 (executable)
index 0000000..9a55fe4
--- /dev/null
@@ -0,0 +1,16 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+diff -u a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
+--- a/src/plugins/fancy/fancy_viewer.c
++++ b/src/plugins/fancy/fancy_viewer.c
+@@ -99,7 +99,7 @@ static void fancy_apply_prefs(FancyViewer *viewer)
+ #endif
+               NULL);
+       if (fancy_prefs.stylesheet == NULL || strlen(fancy_prefs.stylesheet) == 0) {
+-              gchar **msg_font_params = g_strsplit(prefs_common.textfont, " ", 0);
++              gchar **msg_font_params = g_strsplit(prefs_common_get_prefs()->textfont, " ", 0);
+               guint params_len = g_strv_length(msg_font_params);
+               if (params_len > 0) {