summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2021-10-15 10:10:56 +0200
committerOndrej Holy <oholy@redhat.com>2021-10-15 10:23:26 +0200
commit5a78b46f1b1f7e0f8e616fbd78c77c20e6f1c1ef (patch)
tree3ee9705fff183552324388069784c015b2101fd1
parent266745cd9db5f719efced2b6b92183dac0e72339 (diff)
downloadgvfs-wip/oholy/ci-libsoup3.tar.gz
mount: Replace deprecated functionwip/oholy/ci-libsoup3
The `g_spawn_check_exit_status` function is deprecated now and `g_spawn_check_wait_status` should be used instead. Let's make that change and bump the glib dependency accordingly.
-rw-r--r--daemon/mount.c2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/daemon/mount.c b/daemon/mount.c
index db271dd3..41a4b0b7 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -419,7 +419,7 @@ child_watch_cb (GPid pid,
GError *error = NULL;
gint code = 0;
- if (!g_spawn_check_exit_status (status, &error))
+ if (!g_spawn_check_wait_status (status, &error))
{
if (error->domain == G_SPAWN_EXIT_ERROR)
code = error->code;
diff --git a/meson.build b/meson.build
index 6af133ec..bca30b89 100644
--- a/meson.build
+++ b/meson.build
@@ -231,7 +231,7 @@ have_version_script = cc.has_link_argument('@0@,@1@'.format(version_script_ldfla
gio_dep = dependency('gio-2.0')
gio_unix_dep = dependency('gio-unix-2.0')
-glib_dep = dependency('glib-2.0', version: '>= 2.65.1')
+glib_dep = dependency('glib-2.0', version: '>= 2.70.0')
gobject_dep = dependency('gobject-2.0')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>= 3.33.0')