diff options
Diffstat (limited to 'monitor')
28 files changed, 28 insertions, 28 deletions
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am index 0b022b29..0be5f12f 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 1663573a..fa436072 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 dbb172bf..68bb1201 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 index 4e6bd335..40e84f2e 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 6871f587..e483b947 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 b9fc7cb6..6d66ac5d 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 9a976950..25bf4131 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 index 3fe4277b..f0534910 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 e8ef5647..1928e2e3 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 a763c6b1..7396cc83 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 c9e9f48f..17f72e35 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 index cb9a3511..4231821e 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 663c3a9a..4a48bfe9 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 fdbdc44f..e938997d 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 e0a69852..c3cfeef0 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 index b06e3df6..fae13471 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 81d6c107..53395651 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 8b47b743..cec46444 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 c287f853..752e4a3c 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 index c785241d..41c2802c 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 414968d4..2796cbb5 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 43ec9a21..87b9bd46 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 bfb0c7fe..8c811e89 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 index 4cd7d190..5cd88475 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 723380bd..7dd347ad 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 index b2d825c9..22a0bde9 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 dbb0c6a6..8eb1fd4c 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 9ad68cc8..b642baff 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); } |