diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-07-10 15:24:40 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-07-10 15:24:40 +0200 |
| commit | 1106ec3d4977c7eae726b7a3a09836678ff0de78 (patch) | |
| tree | e8e6c35f58c71a407e9ec72358c091de997f1fec | |
| parent | 26cd85ea61fc3f126f969c1a0a257a49fd61c9b5 (diff) | |
| download | gvfs-1106ec3d4977c7eae726b7a3a09836678ff0de78.tar.gz | |
Revert "Do not require the latest glib version"
This reverts commit 550aaf87c222a1626273e579e566f889b43006cf.
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | monitor/udisks2/gvfsudisks2volumemonitor.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/meson.build b/meson.build index f3284432..f171ea56 100644 --- a/meson.build +++ b/meson.build @@ -224,11 +224,9 @@ have_version_script = host_machine.system().contains('linux') and cc.has_argumen gio_dep = dependency('gio-2.0') gio_unix_dep = dependency('gio-unix-2.0') -glib_dep = dependency('glib-2.0', version: '>= 2.51.0') +glib_dep = dependency('glib-2.0', version: '>= 2.57.1') gobject_dep = dependency('gobject-2.0') -config_h.set('HAVE_GLIB_2_57_1', glib_dep.version().version_compare('>= 2.57.1')) - # *** Check for libXML *** libxml_dep = dependency('libxml-2.0', required: false) have_libxml = libxml_dep.found() diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c index e6d42ead..e1d67fb8 100644 --- a/monitor/udisks2/gvfsudisks2volumemonitor.c +++ b/monitor/udisks2/gvfsudisks2volumemonitor.c @@ -698,10 +698,8 @@ should_include_mount (GVfsUDisks2VolumeMonitor *monitor, GUnixMountEntry *mount_entry) { GUnixMountPoint *mount_point; - gboolean ret; - -#ifdef HAVE_GLIB_2_57_1 const gchar *options; + gboolean ret; /* g_unix_mount_get_options works only with libmount, * see https://bugzilla.gnome.org/show_bug.cgi?id=668132 @@ -713,7 +711,6 @@ should_include_mount (GVfsUDisks2VolumeMonitor *monitor, options); goto out; } -#endif /* if mounted at the designated mount point, use that info to decide */ mount_point = get_mount_point_for_mount (mount_entry); |