[gvfs] admin: Use really persistent d-bus name
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] admin: Use really persistent d-bus name
- Date: Thu, 15 Feb 2018 11:29:00 +0000 (UTC)
commit 2502641f953266e17794249650c025b3abce057f
Author: Ondrej Holy <oholy redhat com>
Date: Wed Feb 14 13:10:05 2018 +0100
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
daemon/Makefile.am | 1 +
daemon/meson.build | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 0bdafae..2b9c7e5 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 ba3ef52..bf66594 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]]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]