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 74a149cb997894af2ffe3a7f2c8e0a37dc862a3b..f879117f279535d2db7f3bbfab4655d18f52f0f0 100644 (file)
--- 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 5908f9d4f74ea9cf10df11e9ddf5a254e8ab0828..f2854642911e2ff89526d7e330b17652e62e3b8b 100644 (file)
--- 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"