[Commits] [SCM] claws branch, gtk2, updated. 3.19.1-4-gfe56985ec

[wwp at claws-mail.org]

The branch, gtk2 has been updated
       via  fe56985ec083cd42f65fd24f26daf804c40dbd55 (commit)
      from  d473f965a7a7c203b079cdbde1b80ccc2a275bda (commit)

Summary of changes:
 configure.ac  |  2 +-
 src/compose.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit fe56985ec083cd42f65fd24f26daf804c40dbd55
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Oct 27 21:05:10 2022 +0200

    Raise glib version requirement to 2.50 again
    
    Revert the revert: as discussed on irc first revert seems to be mistake,
    as 2.50 is needed to use G_PID_FORMAT. While we're at it, remove also
    the remaining check for this version.
    
    This reverts commit 1445df7021764ede5cea62338e3724726006c413.

diff --git a/configure.ac b/configure.ac
index 07483efeb..6c41c98f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,7 +465,7 @@ dnl ** common code **
 dnl *****************
 
 dnl check for glib
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36 gmodule-2.0 >= 2.36 gobject-2.0 >= 2.36 gthread-2.0 >= 2.36])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50 gmodule-2.0 >= 2.50 gobject-2.0 >= 2.50 gthread-2.0 >= 2.50])
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
diff --git a/src/compose.c b/src/compose.c
index c07ce3223..f5311f8f0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9850,14 +9850,8 @@ static gboolean compose_ext_editor_kill(Compose *compose)
 		AlertValue val;
 		gchar *msg;
 
-		pidmsg = g_strdup_printf
-#if GLIB_CHECK_VERSION(2, 50, 0)
-			 (_("process id: %" G_PID_FORMAT),
-#else
-			 (_("process id: %d"),
-#endif
-			 pid);
-            
+		pidmsg = g_strdup_printf(_("process id: %" G_PID_FORMAT), pid);
+
 		msg = g_strdup_printf
 			(_("The external editor is still working.\n"
 			   "Force terminating the process?\n"

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


hooks/post-receive
-- 
Claws Mail