build: Add trailing commas

Add missing trailing commas that avoids getting noise when another
file/parameter is added and eases reviewing changes[0].

[0] https://gitlab.gnome.org/GNOME/dconf/merge_requests/11#note_291585

15 files changed, 155 insertions, 155 deletions

diff --git a/client/meson.build b/client/meson.build
index 3bc4681f..b2d13597 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -1,18 +1,18 @@
 headers = files(
   'gvfsurimapper.h',
-  'gvfsuriutils.h'
+  'gvfsuriutils.h',
 )
 
 install_headers(
   headers,
-  subdir: join_paths('gvfs-client', 'gvfs')
+  subdir: join_paths('gvfs-client', 'gvfs'),
 )
 
 # Dynamic client lib
 uri_parser_sources = files(
   'afpuri.c',
   'httpuri.c',
-  'smburi.c'
+  'smburi.c',
 )
 
 uri_utils = files('gvfsuriutils.c')
@@ -28,19 +28,19 @@ sources = uri_parser_sources + uri_utils + files(
   'gdaemonvolumemonitor.c',
   'gvfsdaemondbus.c',
   'gvfsiconloadable.c',
-  'gvfsurimapper.c'
+  'gvfsurimapper.c',
 )
 
 deps = [
   gio_unix_dep,
   libgvfscommon_dep,
-  libmetadata_dep
+  libmetadata_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
-  '-DGVFS_MODULE_DIR="@0@"'.format(join_paths(gvfs_libdir, 'gvfs', 'modules'))
+  '-DGVFS_MODULE_DIR="@0@"'.format(join_paths(gvfs_libdir, 'gvfs', 'modules')),
 ]
 
 symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
@@ -60,7 +60,7 @@ libgvfsdbus = shared_module(
   link_depends: symbol_map,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gio_module_dir
+  install_dir: gio_module_dir,
 )
 
 if enable_devel_utils
@@ -71,7 +71,7 @@ if enable_devel_utils
     [test_name + '.c'] + uri_utils,
     include_directories: top_inc,
     dependencies: libgvfscommon_dep,
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -80,13 +80,13 @@ if enable_fuse
   if install_tmp_files_dir
     install_data(
       'gvfsd-fuse-tmpfiles.conf',
-      install_dir: tmp_files_dir
+      install_dir: tmp_files_dir,
     )
   endif
 
   deps = [
     fuse_dep,
-    libgvfscommon_dep
+    libgvfscommon_dep,
   ]
 
   executable(
@@ -97,6 +97,6 @@ if enable_fuse
     c_args: cflags + ['-UG_LOG_DOMAIN'],
     install: true,
     install_rpath: gvfs_rpath,
-    install_dir: gvfs_libexecdir
+    install_dir: gvfs_libexecdir,
   )
 endif
diff --git a/common/meson.build b/common/meson.build
index ab09c33a..a718783f 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -11,7 +11,7 @@ sources = files(
   'gvfsfileinfo.c',
   'gvfsicon.c',
   'gvfsmonitorimpl.c',
-  'gvfsutils.c'
+  'gvfsutils.c',
 )
 
 # FIXME: Ugly workaround that simulates the generation of
@@ -23,13 +23,13 @@ dbus_sources = custom_target(
   name,
   input: gvfs_namespace + '.xml',
   output: [name + '.c', name + '.h'],
-  command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@']
+  command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@'],
 )
 
 deps = [
   gio_dep,
   glib_dep,
-  gobject_dep
+  gobject_dep,
 ]
 
 cflags = common_cflags + ['-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir)]
@@ -41,19 +41,19 @@ libgvfscommon = shared_library(
   dependencies: deps + [gio_unix_dep],
   c_args: cflags,
   install: true,
-  install_dir: gvfs_pkglibdir
+  install_dir: gvfs_pkglibdir,
 )
 
 libgvfscommon_dep = declare_dependency(
   sources: dbus_sources[1],
   include_directories: common_inc,
   dependencies: deps,
-  link_with: libgvfscommon
+  link_with: libgvfscommon,
 )
 
 deps = [
   gio_dep,
-  glib_dep
+  glib_dep,
 ]
 
 if enable_bluray
@@ -66,26 +66,26 @@ libgvfscommon_monitor = static_library(
   include_directories: top_inc,
   dependencies: deps,
   c_args: common_cflags,
-  link_with: libgvfscommon
+  link_with: libgvfscommon,
 )
 
 libgvfscommon_monitor_dep = declare_dependency(
   include_directories: common_inc,
   dependencies: gio_dep,
-  link_with: libgvfscommon_monitor
+  link_with: libgvfscommon_monitor,
 )
 
 if enable_dnssd
   sources = files(
     'gvfsdnssdresolver.c',
-    'gvfsdnssdutils.c'
+    'gvfsdnssdutils.c',
   )
 
   deps = [
     avahi_client_dep,
     avahi_glib_dep,
     gio_dep,
-    glib_dep
+    glib_dep,
   ]
 
   libgvfscommon_dnssd = static_library(
@@ -94,32 +94,32 @@ if enable_dnssd
     include_directories: top_inc,
     dependencies: deps,
     c_args: common_cflags,
-    link_with: libgvfscommon
+    link_with: libgvfscommon,
   )
 
   libgvfscommon_dnssd_dep = declare_dependency(
     include_directories: common_inc,
     dependencies: gio_dep,
-    link_with: libgvfscommon_dnssd
+    link_with: libgvfscommon_dnssd,
   )
 endif
 
 if enable_mtp or enable_gphoto2
   deps = [
     glib_dep,
-    gudev_dep
+    gudev_dep,
   ]
 
   libgvfscommon_gphoto2 = static_library(
     'gvfscommon-gphoto2',
     sources: 'gvfsgphoto2utils.c',
     include_directories: top_inc,
-    dependencies: deps
+    dependencies: deps,
   )
 
   libgvfscommon_gphoto2_dep = declare_dependency(
     include_directories: common_inc,
     dependencies: deps,
-    link_with: libgvfscommon_gphoto2
+    link_with: libgvfscommon_gphoto2,
   )
 endif
diff --git a/daemon/meson.build b/daemon/meson.build
index 7f2608bd..b835acf6 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -13,7 +13,7 @@ if install_systemd_user_unit_dir
     output: service,
     install: true,
     install_dir: systemd_user_unit_dir,
-    configuration: service_conf
+    configuration: service_conf,
   )
 
   dbus_systemd_service = 'SystemdService=' + service
@@ -29,7 +29,7 @@ daemon_service = configure_file(
   output: dbus_service + '.service',
   install: true,
   install_dir: dbus_service_dir,
-  configuration: dbus_service_conf
+  configuration: dbus_service_conf,
 )
 
 gnome.mkenums(
@@ -42,7 +42,7 @@ gnome.mkenums(
   vtail: '  </@type@>',
   ftail: '</schemalist>',
   install_header: true,
-  install_dir: gvfs_schema_dir
+  install_dir: gvfs_schema_dir,
 )
 
 sources = files(
@@ -92,12 +92,12 @@ sources = files(
   'gvfskeyring.c',
   'gvfsmonitor.c',
   'gvfsreadchannel.c',
-  'gvfswritechannel.c'
+  'gvfswritechannel.c',
 )
 
 deps = socket_deps + [
   gio_unix_dep,
-  libgvfscommon_dep
+  libgvfscommon_dep,
 ]
 
 if enable_gcr
@@ -111,7 +111,7 @@ endif
 cflags = [
   '-DLIBEXEC_DIR="@0@"'.format(gvfs_libexecdir),
   '-DMOUNTABLE_DIR="@0@"'.format(gvfs_mountdir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 libgvfsdaemon = shared_library(
@@ -121,19 +121,19 @@ libgvfsdaemon = shared_library(
   dependencies: deps,
   c_args: cflags,
   install: true,
-  install_dir: gvfs_pkglibdir
+  install_dir: gvfs_pkglibdir,
 )
 
 libgvfsdaemon_dep = declare_dependency(
   include_directories: include_directories('.'),
   dependencies: libgvfscommon_dep,
   compile_args: cflags,
-  link_with: libgvfsdaemon
+  link_with: libgvfsdaemon,
 )
 
 sources = files(
   'main.c',
-  'mount.c'
+  'mount.c',
 )
 
 executable(
@@ -143,12 +143,12 @@ executable(
   dependencies: libgvfsdaemon_dep,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
 
 daemon_main_sources = files(
   'daemon-main.c',
-  'daemon-main-generic.c'
+  'daemon-main-generic.c',
 )
 
 programs = []
@@ -161,7 +161,7 @@ sources = files('gvfsbackendlocaltest.c')
 cflags = [
   '-DBACKEND_HEADER=gvfsbackendlocaltest.h',
   '-DDEFAULT_BACKEND_TYPE=localtest',
-  '-DBACKEND_TYPES="localtest", G_VFS_TYPE_BACKEND_LOCALTEST,'
+  '-DBACKEND_TYPES="localtest", G_VFS_TYPE_BACKEND_LOCALTEST,',
 ]
 
 programs += [['gvfsd-localtest', sources, [], cflags]]
@@ -173,14 +173,14 @@ sources = files(
   'gvfsftpdircache.c',
   'gvfsftpfile.c',
   'gvfsftptask.c',
-  'ParseFTPList.c'
+  'ParseFTPList.c',
 )
 
 cflags = [
   '-DBACKEND_HEADER=gvfsbackendftp.h',
   '-DDEFAULT_BACKEND_TYPE=ftp',
   '-DBACKEND_TYPES="ftp", G_VFS_TYPE_BACKEND_FTP, "ftps", G_VFS_TYPE_BACKEND_FTP, "ftpis", G_VFS_TYPE_BACKEND_FTP,',
-  '-DMAX_JOB_THREADS=10'
+  '-DMAX_JOB_THREADS=10',
 ]
 
 programs += [['gvfsd-ftp', sources, [], cflags]]
@@ -194,7 +194,7 @@ cflags = [
   '-DBACKEND_HEADER=gvfsbackendtrash.h',
   '-DDEFAULT_BACKEND_TYPE=trash',
   '-DBACKEND_TYPES="trash", G_VFS_TYPE_BACKEND_TRASH,',
-  '-DMAX_JOB_THREADS=10'
+  '-DMAX_JOB_THREADS=10',
 ]
 
 programs += [['gvfsd-trash', sources, deps, cflags]]
@@ -207,7 +207,7 @@ cflags = [
   '-DDEFAULT_BACKEND_TYPE=recent',
   '-DBACKEND_TYPES="recent", G_VFS_TYPE_BACKEND_RECENT,',
   '-DBACKEND_USES_GVFS=1',
-  '-DMAX_JOB_THREADS=10'
+  '-DMAX_JOB_THREADS=10',
 ]
 
 programs += [['gvfsd-recent', sources, [], cflags]]
@@ -220,7 +220,7 @@ cflags = [
   '-DDEFAULT_BACKEND_TYPE=computer',
   '-DBACKEND_TYPES="computer", G_VFS_TYPE_BACKEND_COMPUTER,',
   '-DBACKEND_USES_GVFS=1',
-  '-DMAX_JOB_THREADS=1'
+  '-DMAX_JOB_THREADS=1',
 ]
 
 programs += [['gvfsd-computer', sources, [gio_unix_dep], cflags]]
@@ -233,7 +233,7 @@ cflags = [
   '-DDEFAULT_BACKEND_TYPE=network',
   '-DBACKEND_TYPES="network", G_VFS_TYPE_BACKEND_NETWORK,',
   '-DBACKEND_USES_GVFS=1',
-  '-DMAX_JOB_THREADS=1'
+  '-DMAX_JOB_THREADS=1',
 ]
 
 programs += [['gvfsd-network', sources, [], cflags]]
@@ -245,7 +245,7 @@ cflags = [
   '-DBACKEND_HEADER=gvfsbackendburn.h',
   '-DDEFAULT_BACKEND_TYPE=burn',
   '-DBACKEND_TYPES="burn", G_VFS_TYPE_BACKEND_BURN,',
-  '-DMAX_JOB_THREADS=1'
+  '-DMAX_JOB_THREADS=1',
 ]
 
 programs += [['gvfsd-burn', sources, [gio_unix_dep], cflags]]
@@ -254,7 +254,7 @@ mounts += ['burn']
 if enable_sftp
   sources = files(
     'gvfsbackendsftp.c',
-    'pty_open.c'
+    'pty_open.c',
   )
 
   deps = socket_deps + [
@@ -267,7 +267,7 @@ if enable_sftp
     '-DDEFAULT_BACKEND_TYPE=sftp',
     '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,',
     '-DMAX_JOB_THREADS=1',
-    '-DSSH_PROGRAM="@0@"'.format(ssh.path())
+    '-DSSH_PROGRAM="@0@"'.format(ssh.path()),
   ]
 
   programs += [['gvfsd-sftp', sources, deps, cflags]]
@@ -283,7 +283,7 @@ if enable_samba
     '-DBACKEND_HEADER=gvfsbackendsmb.h',
     '-DDEFAULT_BACKEND_TYPE=smb',
     '-DBACKEND_TYPES="smb-share", G_VFS_TYPE_BACKEND_SMB,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-smb', sources, deps, cflags]]
@@ -298,7 +298,7 @@ if enable_samba
     '-DDEFAULT_BACKEND_TYPE=smb-network',
     '-DBACKEND_TYPES="smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE, "smb-server",  G_VFS_TYPE_BACKEND_SMB_BROWSE,',
     '-DMAX_JOB_THREADS=1',
-    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_smb_browse'
+    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_smb_browse',
   ]
 
   programs += [['gvfsd-smb-browse', sources, deps, cflags]]
@@ -311,7 +311,7 @@ if enable_dnssd
   deps = [
     avahi_client_dep,
     avahi_glib_dep,
-    libgvfscommon_dnssd_dep
+    libgvfscommon_dnssd_dep,
   ]
 
   cflags = [
@@ -319,7 +319,7 @@ if enable_dnssd
     '-DDEFAULT_BACKEND_TYPE=dns-sd',
     '-DBACKEND_TYPES="dns-sd", G_VFS_TYPE_BACKEND_DNS_SD,',
     '-DMAX_JOB_THREADS=1',
-    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_dnssd'
+    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_dnssd',
   ]
 
   programs += [['gvfsd-dnssd', sources, deps, cflags]]
@@ -338,7 +338,7 @@ if enable_archive
     '-DDEFAULT_BACKEND_TYPE=archive',
     '-DBACKEND_TYPES="archive", G_VFS_TYPE_BACKEND_ARCHIVE,',
     '-DMAX_JOB_THREADS=1',
-    '-DBACKEND_USES_GVFS=1'
+    '-DBACKEND_USES_GVFS=1',
   ]
 
   programs += [['gvfsd-archive', sources, deps, cflags]]
@@ -350,14 +350,14 @@ if enable_cdda
 
   deps = [
     gudev_dep,
-    libcdio_paranoia_dep
+    libcdio_paranoia_dep,
   ]
 
   cflags = [
     '-DBACKEND_HEADER=gvfsbackendcdda.h',
     '-DDEFAULT_BACKEND_TYPE=cdda',
     '-DBACKEND_TYPES="cdda", G_VFS_TYPE_BACKEND_CDDA,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-cdda', sources, deps, cflags]]
@@ -369,14 +369,14 @@ if enable_admin
 
   deps = [
     libcap_dep,
-    polkit_gobject_dep
+    polkit_gobject_dep,
   ]
 
   cflags = [
     '-DBACKEND_HEADER=gvfsbackendadmin.h',
     '-DDEFAULT_BACKEND_TYPE=admin',
     '-DBACKEND_TYPES="admin", G_VFS_TYPE_BACKEND_ADMIN,',
-    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_admin'
+    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_admin',
   ]
 
   programs += [['gvfsd-admin', sources, deps, cflags]]
@@ -387,7 +387,7 @@ if enable_admin
   policy_in = configure_file(
     input: policy + '.in.in',
     output: policy + '.in',
-    configuration: service_conf
+    configuration: service_conf,
   )
 
   i18n.merge_file(
@@ -396,12 +396,12 @@ if enable_admin
     output: policy,
     po_dir: po_dir,
     install: true,
-    install_dir: join_paths(gvfs_datadir, 'polkit-1', 'actions')
+    install_dir: join_paths(gvfs_datadir, 'polkit-1', 'actions'),
   )
 
   install_data(
     gvfs_namespace + '.file-operations.rules',
-    install_dir: join_paths(gvfs_datadir, 'polkit-1', 'rules.d')
+    install_dir: join_paths(gvfs_datadir, 'polkit-1', 'rules.d'),
   )
 endif
 
@@ -410,13 +410,13 @@ if enable_google
 
   deps = [
     goa_dep,
-    libgdata_dep
+    libgdata_dep,
   ]
 
   cflags = [
     '-DBACKEND_HEADER=gvfsbackendgoogle.h',
     '-DDEFAULT_BACKEND_TYPE=google-drive',
-    '-DBACKEND_TYPES="google-drive", G_VFS_TYPE_BACKEND_GOOGLE,'
+    '-DBACKEND_TYPES="google-drive", G_VFS_TYPE_BACKEND_GOOGLE,',
   ]
 
   programs += [['gvfsd-google', sources, deps, cflags]]
@@ -429,14 +429,14 @@ if enable_gphoto2
   deps = [
     gio_unix_dep,
     libgphoto2_dep,
-    libgvfscommon_gphoto2_dep
+    libgvfscommon_gphoto2_dep,
   ]
 
   cflags = [
     '-DBACKEND_HEADER=gvfsbackendgphoto2.h',
     '-DDEFAULT_BACKEND_TYPE=gphoto2',
     '-DBACKEND_TYPES="gphoto2", G_VFS_TYPE_BACKEND_GPHOTO2,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-gphoto2', sources, deps, cflags]]
@@ -455,7 +455,7 @@ if enable_mtp
     '-DBACKEND_HEADER=gvfsbackendmtp.h',
     '-DDEFAULT_BACKEND_TYPE=mtp',
     '-DBACKEND_TYPES="mtp", G_VFS_TYPE_BACKEND_MTP,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   if enable_libusb
@@ -469,12 +469,12 @@ endif
 if enable_http
   sources = files(
     'gvfsbackendhttp.c',
-    'gvfshttpinputstream.c'
+    'gvfshttpinputstream.c',
   )
 
   deps = [
     libsoup_dep,
-    libxml_dep
+    libxml_dep,
   ]
 
   cflags = [
@@ -482,7 +482,7 @@ if enable_http
     '-DDEFAULT_BACKEND_TYPE=http',
     '-DBACKEND_TYPES="http", G_VFS_TYPE_BACKEND_HTTP,',
     '-DMAX_JOB_THREADS=1',
-    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_http'
+    '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_http',
   ]
 
   programs += [['gvfsd-http', sources, deps, cflags]]
@@ -493,7 +493,7 @@ if enable_http
   cflags = [
     '-DBACKEND_HEADER=gvfsbackenddav.h',
     '-DDEFAULT_BACKEND_TYPE=dav',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   if enable_dnssd
@@ -515,7 +515,7 @@ if enable_afc
 
   deps = [
     libimobiledevice_dep,
-    libplist_dep
+    libplist_dep,
   ]
 
   cflags = [
@@ -523,7 +523,7 @@ if enable_afc
     '-DDEFAULT_BACKEND_TYPE=afc',
     '-DBACKEND_TYPES="afc", G_VFS_TYPE_BACKEND_AFC,',
     '-DMAX_JOB_THREADS=1',
-    '-DBACKEND_USES_GVFS=1'
+    '-DBACKEND_USES_GVFS=1',
   ]
 
   programs += [['gvfsd-afc', sources, deps, cflags]]
@@ -536,7 +536,7 @@ if enable_afp
     'gvfsafputils.c',
     'gvfsafpconnection.c',
     'gvfsafpserver.c',
-    'gvfsafpvolume.c'
+    'gvfsafpvolume.c',
   )
 
   sources = common_sources + files('gvfsbackendafp.c')
@@ -550,7 +550,7 @@ if enable_afp
     '-DBACKEND_HEADER=gvfsbackendafp.h',
     '-DDEFAULT_BACKEND_TYPE=afp-volume',
     '-DBACKEND_TYPES="afp-volume", G_VFS_TYPE_BACKEND_AFP,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-afp', sources, deps, cflags]]
@@ -562,7 +562,7 @@ if enable_afp
     '-DBACKEND_HEADER=gvfsbackendafpbrowse.h',
     '-DDEFAULT_BACKEND_TYPE=afp-server',
     '-DBACKEND_TYPES="afp-server", G_VFS_TYPE_BACKEND_AFP_BROWSE,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-afp-browse', sources, deps, cflags]]
@@ -578,7 +578,7 @@ if enable_nfs
     '-DBACKEND_HEADER=gvfsbackendnfs.h',
     '-DDEFAULT_BACKEND_TYPE=nfs',
     '-DBACKEND_TYPES="nfs", G_VFS_TYPE_BACKEND_NFS,',
-    '-DMAX_JOB_THREADS=1'
+    '-DMAX_JOB_THREADS=1',
   ]
 
   programs += [['gvfsd-nfs', sources, deps, cflags]]
@@ -594,7 +594,7 @@ foreach program: programs
     c_args: program[3],
     install: true,
     install_rpath: gvfs_rpath,
-    install_dir: gvfs_libexecdir
+    install_dir: gvfs_libexecdir,
   )
 endforeach
 
@@ -606,7 +606,7 @@ foreach mount: mounts
     output: name,
     install: true,
     install_dir: gvfs_mountdir,
-    configuration: service_conf
+    configuration: service_conf,
   )
 endforeach
 
@@ -616,7 +616,7 @@ if enable_devel_utils
   cflags = [
     '-DBACKEND_HEADER=gvfsbackendtest.h',
     '-DDEFAULT_BACKEND_TYPE=test',
-    '-DBACKEND_TYPES="test", G_VFS_TYPE_BACKEND_TEST,'
+    '-DBACKEND_TYPES="test", G_VFS_TYPE_BACKEND_TEST,',
   ]
 
   executable(
@@ -624,16 +624,16 @@ if enable_devel_utils
     sources,
     include_directories: top_inc,
     dependencies: libgvfsdaemon_dep,
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
 install_data(
   schema_data,
-  install_dir: gvfs_schema_dir
+  install_dir: gvfs_schema_dir,
 )
 
 install_data(
   convert_data,
-  install_dir: join_paths(gvfs_datadir, 'GConf', 'gsettings')
+  install_dir: join_paths(gvfs_datadir, 'GConf', 'gsettings'),
 )
diff --git a/daemon/trashlib/meson.build b/daemon/trashlib/meson.build
index f0735cf8..8b8e20c3 100644
--- a/daemon/trashlib/meson.build
+++ b/daemon/trashlib/meson.build
@@ -3,24 +3,24 @@ sources = files(
   'trashdir.c',
   'trashitem.c',
   'trashwatcher.c',
-  'trashexpunge.c'
+  'trashexpunge.c',
 )
 
 deps = [
   gio_dep,
   gio_unix_dep,
-  glib_dep
+  glib_dep,
 ]
 
 libtrash = static_library(
   'trash',
   sources: sources,
   include_directories: top_inc,
-  dependencies: deps
+  dependencies: deps,
 )
 
 libtrash_dep = declare_dependency(
   include_directories: include_directories('.'),
   dependencies: gio_dep,
-  link_with: libtrash
+  link_with: libtrash,
 )
diff --git a/man/meson.build b/man/meson.build
index ccac1fa9..bf4fcb11 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -11,13 +11,13 @@ xsltproc_cmd = [
   '--stringparam', 'man.authors.section.enabled', '0',
   '--stringparam', 'man.copyright.section.enabled', '0',
   'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-  '@INPUT@'
+  '@INPUT@',
 ]
 
 mans = [
   'gvfsd',
   'gvfsd-fuse',
-  'gvfsd-metadata'
+  'gvfsd-metadata',
 ]
 
 foreach man: mans
@@ -30,7 +30,7 @@ foreach man: mans
     output: output,
     command: xsltproc_cmd,
     install: true,
-    install_dir: join_paths(gvfs_mandir, 'man1')
+    install_dir: join_paths(gvfs_mandir, 'man1'),
   )
 endforeach
 
@@ -43,5 +43,5 @@ custom_target(
   output: output,
   command: xsltproc_cmd,
   install: true,
-  install_dir: join_paths(gvfs_mandir, 'man7')
+  install_dir: join_paths(gvfs_mandir, 'man7'),
 )
diff --git a/meson.build b/meson.build
index 2525a89c..7e539654 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   version: '1.39.4',
   license: 'LGPL2+',
   default_options: 'buildtype=debugoptimized',
-  meson_version: '>= 0.46.0'
+  meson_version: '>= 0.46.0',
 )
 
 gvfs_name = meson.project_name()
@@ -40,7 +40,7 @@ set_defines = [
   ['PACKAGE_STRING', '@0@ @1@'.format(gvfs_name, gvfs_version)],
   ['VERSION', gvfs_version],
   # i18n
-  ['GETTEXT_PACKAGE', gvfs_name]
+  ['GETTEXT_PACKAGE', gvfs_name],
 ]
 
 foreach define: set_defines
@@ -86,7 +86,7 @@ check_headers = [
   'sys/mount.h',
   'sys/statfs.h',
   'sys/statvfs.h',
-  'sys/vfs.h'
+  'sys/vfs.h',
 ]
 
 statfs_includes = ''
@@ -120,7 +120,7 @@ check_headers = [
   'stropts.h',
   'sys/un.h',
   'termios.h',
-  'utmp.h'
+  'utmp.h',
 ]
 
 foreach header: check_headers
@@ -138,7 +138,7 @@ check_functions = [
   'unlockpt',
   # fs
   'statfs',
-  'statvfs'
+  'statvfs',
 ]
 
 foreach func: check_functions
@@ -149,7 +149,7 @@ endforeach
 check_symbols = [
   # i18n
   ['_NL_ADDRESS_LANG_TERM', 'langinfo.h'],
-  ['_NL_ADDRESS_COUNTRY_AB3', 'langinfo.h']
+  ['_NL_ADDRESS_COUNTRY_AB3', 'langinfo.h'],
 ]
 
 foreach symbol: check_symbols
@@ -173,7 +173,7 @@ check_types = [
   ['gid_t', 'int'],
   ['pid_t', 'int'],
   ['size_t', 'unsigned int'],
-  ['uid_t', 'int']
+  ['uid_t', 'int'],
 ]
 
 foreach type: check_types
@@ -192,7 +192,7 @@ check_members = [
   ['struct stat', 'st_ctimensec', 'sys/stat.h'],
   ['struct stat', 'st_ctim.tv_nsec', 'sys/stat.h'],
   ['struct stat', 'st_mtimensec', 'sys/stat.h'],
-  ['struct stat', 'st_mtim.tv_nsec', 'sys/stat.h']
+  ['struct stat', 'st_mtim.tv_nsec', 'sys/stat.h'],
 ]
 
 foreach member: check_members
@@ -209,7 +209,7 @@ if gvfs_debug
     '-Wmissing-prototypes',
     '-Wnested-externs',
     '-Wno-sign-compare',
-    '-Wno-strict-aliasing'
+    '-Wno-strict-aliasing',
   ]
 
   common_flags += cc.get_supported_arguments(test_cflags)
@@ -249,7 +249,7 @@ if enable_gcrypt
     libgcrypt_dep = declare_dependency(
       compile_args: libgcrypt_cflags,
       link_args: libgcrypt_libs,
-      version: libgcrypt_version
+      version: libgcrypt_version,
     )
   endif
 endif
@@ -493,13 +493,13 @@ subdir('test')
 
 configure_file(
   output: 'config.h',
-  configuration: config_h
+  configuration: config_h,
 )
 
 meson.add_install_script(
   'meson_post_install.py',
   gvfs_schema_dir,
-  gio_module_dir
+  gio_module_dir,
 )
 
 output = gvfs_name + ' ' + gvfs_version + ' configuration summary:\n'
diff --git a/metadata/meson.build b/metadata/meson.build
index 01fafe68..e02e7497 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -10,7 +10,7 @@ if install_systemd_user_unit_dir
     output: service,
     install: true,
     install_dir: systemd_user_unit_dir,
-    configuration: service_conf
+    configuration: service_conf,
   )
 
   dbus_systemd_service = 'SystemdService=' + service
@@ -26,7 +26,7 @@ metadata_service = configure_file(
   output: dbus_service + '.service',
   install: true,
   install_dir: dbus_service_dir,
-  configuration: dbus_service_conf
+  configuration: dbus_service_conf,
 )
 
 # FIXME: Ugly workaround that simulates the generation of
@@ -38,24 +38,24 @@ dbus_sources = custom_target(
   name,
   input: 'dbus-interface.xml',
   output: [name + '.c', name + '.h'],
-  command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@']
+  command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@'],
 )
 
 sources = files(
   'crc32.c',
   'metabuilder.c',
-  'metatree.c'
+  'metatree.c',
 )
 
 deps = [
   gio_dep,
-  glib_dep
+  glib_dep,
 ]
 
 cflags = [
   '-DDBUS_API_SUBJECT_TO_CHANGE',
   '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 libmetadata = static_library(
@@ -64,19 +64,19 @@ libmetadata = static_library(
   include_directories: [top_inc, common_inc],
   dependencies: deps + [gio_unix_dep],
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libmetadata_dep = declare_dependency(
   sources: dbus_sources[1],
   include_directories: include_directories('.'),
   dependencies: deps,
-  link_with: libmetadata
+  link_with: libmetadata,
 )
 
 deps = [
   libgvfscommon_dep,
-  libmetadata_dep
+  libmetadata_dep,
 ]
 
 if enable_gudev
@@ -91,7 +91,7 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
 
 if enable_devel_utils
@@ -99,7 +99,7 @@ if enable_devel_utils
     'meta-ls',
     'meta-get',
     'meta-set',
-    'meta-get-tree'
+    'meta-get-tree',
   ]
 
   foreach app: apps
@@ -109,9 +109,9 @@ if enable_devel_utils
       include_directories: top_inc,
       dependencies: [
         libgvfscommon_dep,
-        libmetadata_dep
+        libmetadata_dep,
       ],
-      c_args: cflags
+      c_args: cflags,
     )
   endforeach
 
@@ -122,9 +122,9 @@ if enable_devel_utils
       include_directories: top_inc,
       dependencies: [
         libmetadata_dep,
-        libxml_dep
+        libxml_dep,
       ],
-      c_args: cflags
+      c_args: cflags,
     )
   endif
 endif
diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build
index 741f64e5..ff1177ca 100644
--- a/monitor/afc/meson.build
+++ b/monitor/afc/meson.build
@@ -1,7 +1,7 @@
 sources = files(
   'afcvolumemonitordaemon.c',
   'afcvolume.c',
-  'afcvolumemonitor.c'
+  'afcvolumemonitor.c',
 )
 
 deps = [
@@ -9,13 +9,13 @@ deps = [
   gobject_dep,
   libimobiledevice_dep,
   libplist_dep,
-  libgvfsproxyvolumemonitordaemon_noin_dep
+  libgvfsproxyvolumemonitordaemon_noin_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-AFC"',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 executable(
@@ -26,5 +26,5 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build
index 563d380c..e9f13bdf 100644
--- a/monitor/goa/meson.build
+++ b/monitor/goa/meson.build
@@ -1,20 +1,20 @@
 sources = files(
   'goavolumemonitordaemon.c',
   'goavolume.c',
-  'goavolumemonitor.c'
+  'goavolumemonitor.c',
 )
 
 deps = [
   glib_dep,
   goa_dep,
   gobject_dep,
-  libgvfsproxyvolumemonitordaemon_noin_dep
+  libgvfsproxyvolumemonitordaemon_noin_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-GOA"',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 executable(
@@ -25,5 +25,5 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build
index 63b4e8c7..76a0768e 100644
--- a/monitor/gphoto2/meson.build
+++ b/monitor/gphoto2/meson.build
@@ -1,7 +1,7 @@
 sources = files(
   'gphoto2-volume-monitor-daemon.c',
   'ggphoto2volume.c',
-  'ggphoto2volumemonitor.c'
+  'ggphoto2volumemonitor.c',
 )
 
 deps = [
@@ -9,13 +9,13 @@ deps = [
   gobject_dep,
   libgphoto2_dep,
   libgvfscommon_gphoto2_dep,
-  libgvfsproxyvolumemonitordaemon_noin_dep
+  libgvfsproxyvolumemonitordaemon_noin_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-GPhoto2"',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 executable(
@@ -26,5 +26,5 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
diff --git a/monitor/meson.build b/monitor/meson.build
index 53e18806..15934e7f 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -39,7 +39,7 @@ foreach monitor: monitors
       output: service,
       install: true,
       install_dir: systemd_user_unit_dir,
-      configuration: service_conf
+      configuration: service_conf,
     )
 
     dbus_systemd_service = 'SystemdService=' + service
@@ -49,7 +49,7 @@ foreach monitor: monitors
 
   install_data(
     monitor_data,
-    install_dir: gvfs_remote_volume_monitors_dir
+    install_dir: gvfs_remote_volume_monitors_dir,
   )
 
   dbus_service_conf = configuration_data()
@@ -62,7 +62,7 @@ foreach monitor: monitors
     output: dbus_service + '.service',
     install: true,
     install_dir: dbus_service_dir,
-    configuration: dbus_service_conf
+    configuration: dbus_service_conf,
   )
 
   if monitor[1]
diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build
index ec94c688..0b107871 100644
--- a/monitor/mtp/meson.build
+++ b/monitor/mtp/meson.build
@@ -1,20 +1,20 @@
 sources = files(
   'mtp-volume-monitor-daemon.c',
   'gmtpvolume.c',
-  'gmtpvolumemonitor.c'
+  'gmtpvolumemonitor.c',
 )
 
 deps = [
   gio_unix_dep,
   gobject_dep,
   libgvfscommon_gphoto2_dep,
-  libgvfsproxyvolumemonitordaemon_noin_dep
+  libgvfsproxyvolumemonitordaemon_noin_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-MTP"',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 executable(
@@ -25,5 +25,5 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build
index d2bc2cdb..fb285ebd 100644
--- a/monitor/proxy/meson.build
+++ b/monitor/proxy/meson.build
@@ -2,7 +2,7 @@ dbus_sources = gnome.gdbus_codegen(
   'gvfsvolumemonitordbus',
   'dbus-interfaces.xml',
   interface_prefix: 'org.gtk.Private.',
-  namespace: 'GVfs'
+  namespace: 'GVfs',
 )
 
 sources = files(
@@ -12,19 +12,19 @@ sources = files(
   'gproxymountoperation.c',
   'gproxyshadowmount.c',
   'gproxyvolume.c',
-  'gproxyvolumemonitor.c'
+  'gproxyvolumemonitor.c',
 )
 
 deps = [
   gio_unix_dep,
-  libgvfscommon_dep
+  libgvfscommon_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitor"',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
-  '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir)
+  '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir),
 ]
 
 symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
@@ -44,7 +44,7 @@ libgioremote_volume_monitor = shared_module(
   link_depends: symbol_map,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gio_module_dir
+  install_dir: gio_module_dir,
 )
 
 sources = files('gvfsproxyvolumemonitordaemon.c')
@@ -52,12 +52,12 @@ sources = files('gvfsproxyvolumemonitordaemon.c')
 deps = [
   gio_dep,
   gio_unix_dep,
-  glib_dep
+  glib_dep,
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitorDaemon"',
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir)
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
 libgvfsproxyvolumemonitordaemon_noin = static_library(
@@ -65,11 +65,11 @@ libgvfsproxyvolumemonitordaemon_noin = static_library(
   sources: sources + [dbus_sources],
   include_directories: top_inc,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libgvfsproxyvolumemonitordaemon_noin_dep = declare_dependency(
   include_directories: include_directories('.'),
   dependencies: gio_dep,
-  link_with: libgvfsproxyvolumemonitordaemon_noin
+  link_with: libgvfsproxyvolumemonitordaemon_noin,
 )
diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build
index 26ccc142..19cd852a 100644
--- a/monitor/udisks2/meson.build
+++ b/monitor/udisks2/meson.build
@@ -4,7 +4,7 @@ sources = files(
   'gvfsudisks2mount.c',
   'gvfsudisks2utils.c',
   'gvfsudisks2volume.c',
-  'gvfsudisks2volumemonitor.c'
+  'gvfsudisks2volumemonitor.c',
 )
 
 deps = [
@@ -14,7 +14,7 @@ deps = [
   gudev_dep,
   libgvfscommon_monitor_dep,
   libgvfsproxyvolumemonitordaemon_noin_dep,
-  udisks2_dep
+  udisks2_dep,
 ]
 
 if enable_logind
@@ -30,7 +30,7 @@ cflags = [
   '-DG_DISABLE_DEPRECATED',
   '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
-  '-DUDISKS_API_IS_SUBJECT_TO_CHANGE'
+  '-DUDISKS_API_IS_SUBJECT_TO_CHANGE',
 ]
 
 executable(
@@ -41,5 +41,5 @@ executable(
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gvfs_libexecdir
+  install_dir: gvfs_libexecdir,
 )
diff --git a/test/meson.build b/test/meson.build
index 77d2044c..ee73859a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -12,7 +12,7 @@ if enable_installed_tests
     output: session,
     install: true,
     install_dir: installed_tests_execdir,
-    configuration: tests_conf
+    configuration: tests_conf,
   )
 
   all_tests = 'gvfs-all-tests'
@@ -22,24 +22,24 @@ if enable_installed_tests
     output: all_tests + '.test',
     install: true,
     install_dir: installed_tests_metadir,
-    configuration: tests_conf
+    configuration: tests_conf,
   )
 
   install_subdir(
     'files',
-    install_dir: installed_tests_execdir
+    install_dir: installed_tests_execdir,
   )
 
   gvfs_test = files('gvfs-test')
 
   test_data = gvfs_test + [
     daemon_service,
-    metadata_service
+    metadata_service,
   ]
 
   install_data(
     test_data + monitors_test_data,
-    install_dir: installed_tests_execdir
+    install_dir: installed_tests_execdir,
   )
 endif
 
@@ -49,12 +49,12 @@ if enable_devel_utils
     'benchmark-gvfs-small-files',
     'benchmark-posix-big-files',
     'benchmark-posix-small-files',
-    'test-query-info-stream'
+    'test-query-info-stream',
   ]
 
   deps = [
     gio_dep,
-    glib_dep
+    glib_dep,
   ]
 
   foreach test: tests
@@ -62,7 +62,7 @@ if enable_devel_utils
       test,
       test + '.c',
       include_directories: top_inc,
-      dependencies: deps
+      dependencies: deps,
     )
   endforeach
 endif