[gvfs/wip/oholy/meson-version: 12/15] build: Use dictionaries in configuration_data objects

[Ondrej Holy <oholy src gnome org>]

commit e837684af5a28464366cb0aa92a6200a310fd0ec
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Apr 4 13:14:44 2019 +0200

    build: Use dictionaries in configuration_data objects
    
    Since 0.49.0[0], a dictionary could be used as a replacement for
    each key/value pair as if `set` method was called for each of them.
    
    Almost all of the `configuration_data` objects have been changed to
    use a dictionary.
    
    [0] http://mesonbuild.com/Reference-manual.html#configuration_data

 daemon/meson.build   | 9 +++++----
 meson.build          | 3 +--
 metadata/meson.build | 9 +++++----
 monitor/meson.build  | 9 +++++----
 test/meson.build     | 3 +--
 5 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/daemon/meson.build b/daemon/meson.build
index 0ce0c204..b0adb620 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -19,10 +19,11 @@ if install_systemd_systemduserunitdir
   dbus_systemd_service = 'SystemdService=' + service
 endif
 
-dbus_service_conf = configuration_data()
-dbus_service_conf.set('service', dbus_service)
-dbus_service_conf.set('exec', gvfs_prefix / gvfs_libexecdir / dbus_exec)
-dbus_service_conf.set('systemd_service', dbus_systemd_service)
+dbus_service_conf = {
+  'service': dbus_service,
+  'exec': gvfs_prefix / gvfs_libexecdir / dbus_exec,
+  'systemd_service': dbus_systemd_service,
+}
 
 daemon_service = configure_file(
   input: dbus_service_in,
diff --git a/meson.build b/meson.build
index 93c6404a..50b753b4 100644
--- a/meson.build
+++ b/meson.build
@@ -37,8 +37,7 @@ po_dir = meson.current_source_dir() / 'po'
 
 top_inc = include_directories('.')
 
-service_conf = configuration_data()
-service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
+service_conf = {'libexecdir': gvfs_prefix / gvfs_libexecdir}
 
 cc = meson.get_compiler('c')
 
diff --git a/metadata/meson.build b/metadata/meson.build
index f847e484..905d577b 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -16,10 +16,11 @@ if install_systemd_systemduserunitdir
   dbus_systemd_service = 'SystemdService=' + service
 endif
 
-dbus_service_conf = configuration_data()
-dbus_service_conf.set('service', dbus_service)
-dbus_service_conf.set('exec', gvfs_prefix / gvfs_libexecdir / dbus_exec)
-dbus_service_conf.set('systemd_service', dbus_systemd_service)
+dbus_service_conf = {
+  'service': dbus_service,
+  'exec': gvfs_prefix / gvfs_libexecdir / dbus_exec,
+  'systemd_service': dbus_systemd_service,
+}
 
 metadata_service = configure_file(
   input: dbus_service_in,
diff --git a/monitor/meson.build b/monitor/meson.build
index 7b486caf..c86bb483 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -52,10 +52,11 @@ foreach monitor: monitors
     install_dir: gvfs_remote_volume_monitors_dir,
   )
 
-  dbus_service_conf = configuration_data()
-  dbus_service_conf.set('service', dbus_service)
-  dbus_service_conf.set('exec', gvfs_prefix / gvfs_libexecdir / dbus_exec)
-  dbus_service_conf.set('systemd_service', dbus_systemd_service)
+  dbus_service_conf = {
+    'service': dbus_service,
+    'exec': gvfs_prefix / gvfs_libexecdir / dbus_exec,
+    'systemd_service': dbus_systemd_service,
+  }
 
   monitor_service = configure_file(
     input: dbus_service_in,
diff --git a/test/meson.build b/test/meson.build
index 599fc0b4..552a30cf 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -2,8 +2,7 @@ if enable_installed_tests
   installed_tests_execdir = gvfs_libexecdir / 'installed-tests' / gvfs_name
   installed_tests_metadir = gvfs_datadir / 'installed-tests' / gvfs_name
 
-  tests_conf = configuration_data()
-  tests_conf.set('testdir', gvfs_prefix / installed_tests_execdir)
+  tests_conf = {'testdir': gvfs_prefix / installed_tests_execdir}
 
   configure_file(
     input: 'session.conf.in',