[Commits] [SCM] claws branch, master, updated. 4.1.1-7-ga269d94f6

[mones at claws-mail.org]

The branch, master has been updated
       via  a269d94f63c93562a4b356642e87c00cfd0d2291 (commit)
      from  f0044055815ff65de2e56c9699354f29664d55a9 (commit)

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


- Log -----------------------------------------------------------------
commit a269d94f63c93562a4b356642e87c00cfd0d2291
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 74a149cb9..f879117f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,7 +457,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 5908f9d4f..f28546429 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9822,13 +9822,7 @@ 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"

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


hooks/post-receive
-- 
Claws Mail