[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-54-g570a39583

[wwp at claws-mail.org]

The branch, gtk2 has been updated
       via  570a3958369f30f3bed3939b67d80570354d4c0c (commit)
      from  dea2d896de4740d616bbabb9dd7bea2df757d5ba (commit)

Summary of changes:
 src/compose.c         | 4 ++++
 src/grouplistdialog.c | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 570a3958369f30f3bed3939b67d80570354d4c0c
Author: paul <paul at claws-mail.org>
Date:   Wed Apr 20 08:18:58 2022 +0100

    fix building with older GLIBs

diff --git a/src/compose.c b/src/compose.c
index 198d94d42..1989602ab 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9769,7 +9769,11 @@ static void compose_ext_editor_closed_cb(GPid pid, gint exit_status, gpointer da
 	GtkTextIter start, end;
 	gchar *chars;
 
+#if GLIB_CHECK_VERSION(2,70,0)
+	if (!g_spawn_check_wait_status(exit_status, &error)) {
+#else
 	if (!g_spawn_check_exit_status(exit_status, &error)) {
+#endif
 		alertpanel_error(
 			_("External editor stopped with an error: %s"),
 			error ? error->message : _("Unknown error"));
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 2ed352291..6d854dc81 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -440,8 +440,11 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
 
 	for (cur = group_list; cur != NULL ; cur = cur->next) {
 		NewsGroupInfo *ginfo = (NewsGroupInfo *)cur->data;
-
+#if GLIB_CHECK_VERSION(2,70,0)
+		if (g_pattern_spec_match_string(pspec, ginfo->name)) {
+#else
 		if (g_pattern_match_string(pspec, ginfo->name)) {
+#endif
 			node = grouplist_create_branch(ginfo, pattern);
 			if (g_slist_find_custom(subscribed, ginfo->name,
 						(GCompareFunc)g_ascii_strcasecmp)

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


hooks/post-receive
-- 
Claws Mail