diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-02-14 13:10:05 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-02-15 10:56:11 +0100 |
| commit | 2502641f953266e17794249650c025b3abce057f (patch) | |
| tree | c6ebe7e1f550bc8f92e28dd020491e7d09328897 | |
| parent | 0a3d911d67479464a9f191dabd6c5672fe248180 (diff) | |
| download | gvfs-2502641f953266e17794249650c025b3abce057f.tar.gz | |
admin: Use really persistent d-bus name
Commit 8e9439ef introduced DBusName=org.gtk.vfs.mountpoint_admin
in admin.mount.in, but forgot to set the necessary mount options.
So, each client spawns new daemon currently, which is not necessary.
Let's set the missing -DMOUNTABLE_DBUS_NAME options.
https://bugzilla.gnome.org/show_bug.cgi?id=793445
| -rw-r--r-- | daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | daemon/meson.build | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0bdafae8..2b9c7e53 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -457,6 +457,7 @@ gvfsd_admin_CPPFLAGS = \ -DBACKEND_HEADER=gvfsbackendadmin.h \ -DDEFAULT_BACKEND_TYPE=admin \ -DBACKEND_TYPES='"admin", G_VFS_TYPE_BACKEND_ADMIN,' \ + -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_admin \ $(ADMIN_CFLAGS) gvfsd_admin_LDADD = $(libraries) $(ADMIN_LIBS) diff --git a/daemon/meson.build b/daemon/meson.build index ba3ef52b..bf665946 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -367,7 +367,8 @@ if enable_admin cflags = [ '-DBACKEND_HEADER=gvfsbackendadmin.h', '-DDEFAULT_BACKEND_TYPE=admin', - '-DBACKEND_TYPES="admin", G_VFS_TYPE_BACKEND_ADMIN,' + '-DBACKEND_TYPES="admin", G_VFS_TYPE_BACKEND_ADMIN,', + '-DMOUNTABLE_DBUS_NAME=' + gvfs_namespace + '.mountpoint_admin' ] programs += [['gvfsd-admin', sources, deps, cflags]] |