GNOME.org
 

[gvfs] Make all gvfs daemons own a name under org.gtk.vfs.*

commit 59325dfbe1f855434f87b7791d11175bfdfb9766
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Sep 3 17:53:32 2015 +0200

    Make all gvfs daemons own a name under org.gtk.vfs.*
    
    This allows you to easily allow access to gvfs from a sandbox.
    Just give it talk access to org.gtk.vfs.* and everything will work.
    
    This change does three things:
     Change the existing mountpoint dbus names from
       org.gtk.vfs.mountpoint.foo
     to
       org.gtk.vfs.mountpoint_foo
    
     For other mountpoints, always own:
       org.gtk.vfs.mountpoint_$pid
    
     Change the dbus name of the volume monitors from
       org.gtk.Private.fooMonitor
     to
       org.gtk.vfs.fooMonitor

 daemon/Makefile.am                                 |    4 +-
 daemon/daemon-main.c                               |   28 +++++++++----------
 daemon/http.mount.in                               |    2 +-
 daemon/smb-browse.mount.in                         |    2 +-
 monitor/afc/Makefile.am                            |    2 +-
 monitor/afc/afc.monitor                            |    2 +-
 monitor/afc/afcvolumemonitordaemon.c               |    2 +-
 ....in => org.gtk.vfs.AfcVolumeMonitor.service.in} |    2 +-
 monitor/gdu/Makefile.am                            |    2 +-
 monitor/gdu/gdu-volume-monitor-daemon.c            |    2 +-
 monitor/gdu/gdu.monitor                            |    2 +-
 ....in => org.gtk.vfs.GduVolumeMonitor.service.in} |    2 +-
 monitor/goa/Makefile.am                            |    2 +-
 monitor/goa/goa.monitor                            |    2 +-
 monitor/goa/goavolumemonitordaemon.c               |    2 +-
 ....in => org.gtk.vfs.GoaVolumeMonitor.service.in} |    2 +-
 monitor/gphoto2/Makefile.am                        |    2 +-
 monitor/gphoto2/gphoto2-volume-monitor-daemon.c    |    2 +-
 monitor/gphoto2/gphoto2.monitor                    |    2 +-
 ...=> org.gtk.vfs.GPhoto2VolumeMonitor.service.in} |    2 +-
 monitor/hal/Makefile.am                            |    2 +-
 monitor/hal/hal-volume-monitor-daemon.c            |    2 +-
 monitor/hal/hal.monitor                            |    2 +-
 ....in => org.gtk.vfs.HalVolumeMonitor.service.in} |    2 +-
 monitor/mtp/Makefile.am                            |    2 +-
 monitor/mtp/mtp-volume-monitor-daemon.c            |    2 +-
 monitor/mtp/mtp.monitor                            |    2 +-
 ....in => org.gtk.vfs.MTPVolumeMonitor.service.in} |    2 +-
 monitor/udisks2/Makefile.am                        |    2 +-
 ...=> org.gtk.vfs.UDisks2VolumeMonitor.service.in} |    2 +-
 monitor/udisks2/udisks2.monitor                    |    2 +-
 monitor/udisks2/udisks2volumemonitordaemon.c       |    2 +-
 test/Makefile.am                                   |   20 +++++++-------
 33 files changed, 55 insertions(+), 57 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 59f4a55..a970bff 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -261,7 +261,7 @@ gvfsd_smb_browse_SOURCES = \
 gvfsd_smb_browse_CPPFLAGS = \
        $(flags) \
        -DBACKEND_HEADER=gvfsbackendsmbbrowse.h \
-       -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.smb_browse \
+       -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_smb_browse \
        -DMAX_JOB_THREADS=1 \
        -DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", 
G_VFS_TYPE_BACKEND_SMB_BROWSE,'
 
@@ -486,7 +486,7 @@ gvfsd_http_SOURCES = \
 gvfsd_http_CPPFLAGS = \
        $(flags) \
        -DBACKEND_HEADER=gvfsbackendhttp.h \
-       -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.http \
+       -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_http \
        -DDEFAULT_BACKEND_TYPE=http \
        -DMAX_JOB_THREADS=1 \
        $(HTTP_CFLAGS) \
diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index 4b2d541..d72ea52 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -386,21 +386,19 @@ daemon_main (int argc,
   loop = g_main_loop_new (NULL, FALSE);
   
   name_owner_id = 0;
-  if (mountable_name)
-    {
-      name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                      mountable_name,
-                                      G_BUS_NAME_OWNER_FLAGS_NONE,
-                                      NULL,
-                                      on_name_acquired,
-                                      on_name_lost,
-                                      data,
-                                      NULL);
-    }
-  else
-    {
-      g_idle_add (do_name_acquired, data);
-    }
+  /* We want to own *some* name on the org.gtk.vfs.* namespace so that
+     filtering for us works from a sandbox */
+  if (mountable_name == NULL)
+    mountable_name = g_strdup_printf ("org.gtk.vfs.mountpoint_%d", getpid ());
+
+  name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                                  mountable_name,
+                                  G_BUS_NAME_OWNER_FLAGS_NONE,
+                                  NULL,
+                                  on_name_acquired,
+                                  on_name_lost,
+                                  data,
+                                  NULL);
 
   g_main_loop_run (loop);
   
diff --git a/daemon/http.mount.in b/daemon/http.mount.in
index 21b7930..db0309c 100644
--- a/daemon/http.mount.in
+++ b/daemon/http.mount.in
@@ -2,4 +2,4 @@
 Type=http
 Exec= libexecdir@/gvfsd-http
 AutoMount=true
-DBusName=org.gtk.vfs.mountpoint.http
+DBusName=org.gtk.vfs.mountpoint_http
diff --git a/daemon/smb-browse.mount.in b/daemon/smb-browse.mount.in
index e3b267f..a2970d0 100644
--- a/daemon/smb-browse.mount.in
+++ b/daemon/smb-browse.mount.in
@@ -1,6 +1,6 @@
 [Mount]
 Type=smb-network;smb-server
 Exec= libexecdir@/gvfsd-smb-browse
-DBusName=org.gtk.vfs.mountpoint.smb_browse
+DBusName=org.gtk.vfs.mountpoint_smb_browse
 AutoMount=false
 Scheme=smb
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
index 0b022b2..0be5f12 100644
--- a/monitor/afc/Makefile.am
+++ b/monitor/afc/Makefile.am
@@ -32,7 +32,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = afc.monitor
 
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.AfcVolumeMonitor.service.in
+service_in_files = org.gtk.vfs.AfcVolumeMonitor.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/afc/afc.monitor b/monitor/afc/afc.monitor
index 1663573..fa43607 100644
--- a/monitor/afc/afc.monitor
+++ b/monitor/afc/afc.monitor
@@ -1,5 +1,5 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorAfc
-DBusName=org.gtk.Private.AfcVolumeMonitor
+DBusName=org.gtk.vfs.AfcVolumeMonitor
 IsNative=false
 
diff --git a/monitor/afc/afcvolumemonitordaemon.c b/monitor/afc/afcvolumemonitordaemon.c
index dbb172b..68bb120 100644
--- a/monitor/afc/afcvolumemonitordaemon.c
+++ b/monitor/afc/afcvolumemonitordaemon.c
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
   g_vfs_proxy_volume_monitor_daemon_init ();
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.AfcVolumeMonitor",
+                                                 "org.gtk.vfs.AfcVolumeMonitor",
                                                  G_VFS_TYPE_AFC_VOLUME_MONITOR);
 }
 
diff --git a/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in 
b/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in
similarity index 60%
rename from monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in
rename to monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in
index 4e6bd33..40e84f2 100644
--- a/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in
+++ b/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=org.gtk.Private.AfcVolumeMonitor
+Name=org.gtk.vfs.AfcVolumeMonitor
 Exec= libexecdir@/gvfs-afc-volume-monitor
 
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
index 6871f58..e483b94 100644
--- a/monitor/gdu/Makefile.am
+++ b/monitor/gdu/Makefile.am
@@ -40,7 +40,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = gdu.monitor
 
 servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.GduVolumeMonitor.service.in
+service_in_files = org.gtk.vfs.GduVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/gdu/gdu-volume-monitor-daemon.c b/monitor/gdu/gdu-volume-monitor-daemon.c
index b9fc7cb..6d66ac5 100644
--- a/monitor/gdu/gdu-volume-monitor-daemon.c
+++ b/monitor/gdu/gdu-volume-monitor-daemon.c
@@ -41,6 +41,6 @@ main (int argc, char *argv[])
 
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.GduVolumeMonitor",
+                                                 "org.gtk.vfs.GduVolumeMonitor",
                                                  G_TYPE_GDU_VOLUME_MONITOR);
 }
diff --git a/monitor/gdu/gdu.monitor b/monitor/gdu/gdu.monitor
index 9a97695..25bf413 100644
--- a/monitor/gdu/gdu.monitor
+++ b/monitor/gdu/gdu.monitor
@@ -1,5 +1,5 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorGdu
-DBusName=org.gtk.Private.GduVolumeMonitor
+DBusName=org.gtk.vfs.GduVolumeMonitor
 IsNative=true
 NativePriority=3
diff --git a/monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in 
b/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in
similarity index 60%
rename from monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in
rename to monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in
index 3fe4277..f053491 100644
--- a/monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in
+++ b/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.GduVolumeMonitor
+Name=org.gtk.vfs.GduVolumeMonitor
 Exec= libexecdir@/gvfs-gdu-volume-monitor
diff --git a/monitor/goa/Makefile.am b/monitor/goa/Makefile.am
index e8ef564..1928e2e 100644
--- a/monitor/goa/Makefile.am
+++ b/monitor/goa/Makefile.am
@@ -32,7 +32,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = goa.monitor
 
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.GoaVolumeMonitor.service.in
+service_in_files = org.gtk.vfs.GoaVolumeMonitor.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/goa/goa.monitor b/monitor/goa/goa.monitor
index a763c6b..7396cc8 100644
--- a/monitor/goa/goa.monitor
+++ b/monitor/goa/goa.monitor
@@ -1,4 +1,4 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorGoa
-DBusName=org.gtk.Private.GoaVolumeMonitor
+DBusName=org.gtk.vfs.GoaVolumeMonitor
 IsNative=false
diff --git a/monitor/goa/goavolumemonitordaemon.c b/monitor/goa/goavolumemonitordaemon.c
index c9e9f48..17f72e3 100644
--- a/monitor/goa/goavolumemonitordaemon.c
+++ b/monitor/goa/goavolumemonitordaemon.c
@@ -32,6 +32,6 @@ main (int argc, char *argv[])
   g_vfs_proxy_volume_monitor_daemon_init ();
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.GoaVolumeMonitor",
+                                                 "org.gtk.vfs.GoaVolumeMonitor",
                                                  G_VFS_TYPE_GOA_VOLUME_MONITOR);
 }
diff --git a/monitor/goa/org.gtk.Private.GoaVolumeMonitor.service.in 
b/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in
similarity index 60%
rename from monitor/goa/org.gtk.Private.GoaVolumeMonitor.service.in
rename to monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in
index cb9a351..4231821 100644
--- a/monitor/goa/org.gtk.Private.GoaVolumeMonitor.service.in
+++ b/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.GoaVolumeMonitor
+Name=org.gtk.vfs.GoaVolumeMonitor
 Exec= libexecdir@/gvfs-goa-volume-monitor
diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
index 663c3a9..4a48bfe 100644
--- a/monitor/gphoto2/Makefile.am
+++ b/monitor/gphoto2/Makefile.am
@@ -74,7 +74,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = gphoto2.monitor
 
 servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.GPhoto2VolumeMonitor.service.in
+service_in_files = org.gtk.vfs.GPhoto2VolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/gphoto2/gphoto2-volume-monitor-daemon.c b/monitor/gphoto2/gphoto2-volume-monitor-daemon.c
index fdbdc44..e938997 100644
--- a/monitor/gphoto2/gphoto2-volume-monitor-daemon.c
+++ b/monitor/gphoto2/gphoto2-volume-monitor-daemon.c
@@ -38,6 +38,6 @@ main (int argc, char *argv[])
   g_vfs_proxy_volume_monitor_daemon_init ();
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.GPhoto2VolumeMonitor",
+                                                 "org.gtk.vfs.GPhoto2VolumeMonitor",
                                                  G_TYPE_GPHOTO2_VOLUME_MONITOR);
 }
diff --git a/monitor/gphoto2/gphoto2.monitor b/monitor/gphoto2/gphoto2.monitor
index e0a6985..c3cfeef 100644
--- a/monitor/gphoto2/gphoto2.monitor
+++ b/monitor/gphoto2/gphoto2.monitor
@@ -1,4 +1,4 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorGPhoto2
-DBusName=org.gtk.Private.GPhoto2VolumeMonitor
+DBusName=org.gtk.vfs.GPhoto2VolumeMonitor
 IsNative=false
diff --git a/monitor/gphoto2/org.gtk.Private.GPhoto2VolumeMonitor.service.in 
b/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in
similarity index 59%
rename from monitor/gphoto2/org.gtk.Private.GPhoto2VolumeMonitor.service.in
rename to monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in
index b06e3df..fae1347 100644
--- a/monitor/gphoto2/org.gtk.Private.GPhoto2VolumeMonitor.service.in
+++ b/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.GPhoto2VolumeMonitor
+Name=org.gtk.vfs.GPhoto2VolumeMonitor
 Exec= libexecdir@/gvfs-gphoto2-volume-monitor
diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
index 81d6c10..5339565 100644
--- a/monitor/hal/Makefile.am
+++ b/monitor/hal/Makefile.am
@@ -53,7 +53,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = hal.monitor
 
 servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.HalVolumeMonitor.service.in
+service_in_files = org.gtk.vfs.HalVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/hal/hal-volume-monitor-daemon.c b/monitor/hal/hal-volume-monitor-daemon.c
index 8b47b74..cec4644 100644
--- a/monitor/hal/hal-volume-monitor-daemon.c
+++ b/monitor/hal/hal-volume-monitor-daemon.c
@@ -38,6 +38,6 @@ main (int argc, char *argv[])
   g_vfs_proxy_volume_monitor_daemon_init ();
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.HalVolumeMonitor",
+                                                 "org.gtk.vfs.HalVolumeMonitor",
                                                  G_TYPE_HAL_VOLUME_MONITOR);
 }
diff --git a/monitor/hal/hal.monitor b/monitor/hal/hal.monitor
index c287f85..752e4a3 100644
--- a/monitor/hal/hal.monitor
+++ b/monitor/hal/hal.monitor
@@ -1,5 +1,5 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorHal
-DBusName=org.gtk.Private.HalVolumeMonitor
+DBusName=org.gtk.vfs.HalVolumeMonitor
 IsNative=true
 NativePriority=2
diff --git a/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in 
b/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in
similarity index 60%
rename from monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in
rename to monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in
index c785241..41c2802 100644
--- a/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in
+++ b/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.HalVolumeMonitor
+Name=org.gtk.vfs.HalVolumeMonitor
 Exec= libexecdir@/gvfs-hal-volume-monitor
diff --git a/monitor/mtp/Makefile.am b/monitor/mtp/Makefile.am
index 414968d..2796cbb 100644
--- a/monitor/mtp/Makefile.am
+++ b/monitor/mtp/Makefile.am
@@ -37,7 +37,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = mtp.monitor
 
 servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.MTPVolumeMonitor.service.in
+service_in_files = org.gtk.vfs.MTPVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/mtp/mtp-volume-monitor-daemon.c b/monitor/mtp/mtp-volume-monitor-daemon.c
index 43ec9a2..87b9bd4 100644
--- a/monitor/mtp/mtp-volume-monitor-daemon.c
+++ b/monitor/mtp/mtp-volume-monitor-daemon.c
@@ -30,6 +30,6 @@ main (int argc, char *argv[])
   g_vfs_proxy_volume_monitor_daemon_init ();
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.MTPVolumeMonitor",
+                                                 "org.gtk.vfs.MTPVolumeMonitor",
                                                  G_TYPE_MTP_VOLUME_MONITOR);
 }
diff --git a/monitor/mtp/mtp.monitor b/monitor/mtp/mtp.monitor
index bfb0c7f..8c811e8 100644
--- a/monitor/mtp/mtp.monitor
+++ b/monitor/mtp/mtp.monitor
@@ -1,4 +1,4 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorMTP
-DBusName=org.gtk.Private.MTPVolumeMonitor
+DBusName=org.gtk.vfs.MTPVolumeMonitor
 IsNative=false
diff --git a/monitor/mtp/org.gtk.Private.MTPVolumeMonitor.service.in 
b/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in
similarity index 60%
rename from monitor/mtp/org.gtk.Private.MTPVolumeMonitor.service.in
rename to monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in
index 4cd7d19..5cd8847 100644
--- a/monitor/mtp/org.gtk.Private.MTPVolumeMonitor.service.in
+++ b/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.MTPVolumeMonitor
+Name=org.gtk.vfs.MTPVolumeMonitor
 Exec= libexecdir@/gvfs-mtp-volume-monitor
diff --git a/monitor/udisks2/Makefile.am b/monitor/udisks2/Makefile.am
index 723380b..7dd347a 100644
--- a/monitor/udisks2/Makefile.am
+++ b/monitor/udisks2/Makefile.am
@@ -45,7 +45,7 @@ remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
 remote_volume_monitors_DATA = udisks2.monitor
 
 servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.Private.UDisks2VolumeMonitor.service.in
+service_in_files = org.gtk.vfs.UDisks2VolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/monitor/udisks2/org.gtk.Private.UDisks2VolumeMonitor.service.in 
b/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in
similarity index 59%
rename from monitor/udisks2/org.gtk.Private.UDisks2VolumeMonitor.service.in
rename to monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in
index b2d825c..22a0bde 100644
--- a/monitor/udisks2/org.gtk.Private.UDisks2VolumeMonitor.service.in
+++ b/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gtk.Private.UDisks2VolumeMonitor
+Name=org.gtk.vfs.UDisks2VolumeMonitor
 Exec= libexecdir@/gvfs-udisks2-volume-monitor
diff --git a/monitor/udisks2/udisks2.monitor b/monitor/udisks2/udisks2.monitor
index dbb0c6a..8eb1fd4 100644
--- a/monitor/udisks2/udisks2.monitor
+++ b/monitor/udisks2/udisks2.monitor
@@ -1,5 +1,5 @@
 [RemoteVolumeMonitor]
 Name=GProxyVolumeMonitorUDisks2
-DBusName=org.gtk.Private.UDisks2VolumeMonitor
+DBusName=org.gtk.vfs.UDisks2VolumeMonitor
 IsNative=true
 NativePriority=4
diff --git a/monitor/udisks2/udisks2volumemonitordaemon.c b/monitor/udisks2/udisks2volumemonitordaemon.c
index 9ad68cc..b642baf 100644
--- a/monitor/udisks2/udisks2volumemonitordaemon.c
+++ b/monitor/udisks2/udisks2volumemonitordaemon.c
@@ -41,6 +41,6 @@ main (int argc, char *argv[])
 
   return g_vfs_proxy_volume_monitor_daemon_main (argc,
                                                  argv,
-                                                 "org.gtk.Private.UDisks2VolumeMonitor",
+                                                 "org.gtk.vfs.UDisks2VolumeMonitor",
                                                  GVFS_TYPE_UDISKS2_VOLUME_MONITOR);
 }
diff --git a/test/Makefile.am b/test/Makefile.am
index 309aaac..b69086e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -33,33 +33,33 @@ gvfs-metadata.service: $(top_srcdir)/metadata/gvfs-metadata.service.in ../config
 CONFIG_FILES=session.conf gvfs-daemon.service gvfs-metadata.service
 
 if USE_AFC
-org.gtk.Private.AfcVolumeMonitor.service: 
$(top_srcdir)/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in ../config.log
+org.gtk.vfs.AfcVolumeMonitor.service: $(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in 
../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/afc|" $< > $@
-CONFIG_FILES+=org.gtk.Private.AfcVolumeMonitor.service afc.monitor
+CONFIG_FILES+=org.gtk.vfs.AfcVolumeMonitor.service afc.monitor
 endif
 
 if USE_GDU
-org.gtk.Private.GduVolumeMonitor.service: 
$(top_srcdir)/monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in ../config.log
+org.gtk.vfs.GduVolumeMonitor.service: $(top_srcdir)/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in 
../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/gdu|" $< > $@
-CONFIG_FILES+=org.gtk.Private.GduVolumeMonitor.service gdu.monitor
+CONFIG_FILES+=org.gtk.vfs.GduVolumeMonitor.service gdu.monitor
 endif
 
 if USE_GPHOTO2
-org.gtk.Private.GPhoto2VolumeMonitor.service: 
$(top_srcdir)/monitor/gphoto2/org.gtk.Private.GPhoto2VolumeMonitor.service.in ../config.log
+org.gtk.vfs.GPhoto2VolumeMonitor.service: 
$(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in ../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/gphoto2|" $< > $@
-CONFIG_FILES+=org.gtk.Private.GPhoto2VolumeMonitor.service gphoto2.monitor
+CONFIG_FILES+=org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor
 endif
 
 if USE_HAL
-org.gtk.Private.HalVolumeMonitor.service: 
$(top_srcdir)/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in ../config.log
+org.gtk.vfs.HalVolumeMonitor.service: $(top_srcdir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in 
../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/hal|" $< > $@
-CONFIG_FILES+=org.gtk.Private.HalVolumeMonitor.service hal.monitor
+CONFIG_FILES+=org.gtk.vfs.HalVolumeMonitor.service hal.monitor
 endif
 
 if USE_UDISKS2
-org.gtk.Private.UDisks2VolumeMonitor.service: 
$(top_srcdir)/monitor/udisks2/org.gtk.Private.UDisks2VolumeMonitor.service.in ../config.log
+org.gtk.vfs.UDisks2VolumeMonitor.service: 
$(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in ../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/udisks2|" $< > $@
-CONFIG_FILES+=org.gtk.Private.UDisks2VolumeMonitor.service udisks2.monitor
+CONFIG_FILES+=org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor
 endif
 
 noinst_DATA += $(CONFIG_FILES)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]