From 5a10b403c7f7443430eb8cb216f06809cfbe4e53 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Sun, 12 Oct 2008 17:05:17 +0000 Subject: [PATCH] Deprecate g_volume_monitor_adopt_orphan_mount() (#555331). 2008-10-12 David Zeuthen * gio.symbols: * gunionvolumemonitor.c: * gvolumemonitor.h: Deprecate g_volume_monitor_adopt_orphan_mount() (#555331). svn path=/trunk/; revision=7594 --- gio/ChangeLog | 7 +++++++ gio/gio.symbols | 2 ++ gio/gunionvolumemonitor.c | 5 +++++ gio/gvolumemonitor.h | 4 +++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 744cd41..62048ce 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,10 @@ +2008-10-12 David Zeuthen + + * gio.symbols: + * gunionvolumemonitor.c: + * gvolumemonitor.h: + Deprecate g_volume_monitor_adopt_orphan_mount() (#555331). + 2008-10-10 Alexander Larsson * gfileattribute.c (escape_byte_string): diff --git a/gio/gio.symbols b/gio/gio.symbols index 2e49f53..36b43e1 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -758,9 +758,11 @@ g_volume_monitor_get_mount_for_uuid #endif #if IN_FILE(__G_UNION_VOLUME_MONITOR_C__) g_volume_monitor_get +#ifndef G_DISABLE_DEPRECATED g_volume_monitor_adopt_orphan_mount #endif #endif +#endif #if IN_HEADER(__G_NATIVE_VOLUME_MONITOR_H__) #if IN_FILE(__G_NATIVE_VOLUME_MONITOR_C__) diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 8009262..f12ecd9 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -634,6 +634,11 @@ _g_mount_get_for_mount_path (const char *mount_path, * * Returns: the #GVolume object that is the parent for @mount or %NULL * if no wants to adopt the #GMount. + * + * Deprecated: 2.20: Instead of using this function, #GVolumeMonitor + * implementations should instead create shadow mounts with the URI of + * the mount they intend to adopt. See the proxy volume monitor in + * gvfs for an example of this. */ GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount) diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 6c9f712..4d286f1 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -109,7 +109,7 @@ struct _GVolumeMonitorClass const char *uuid); - /* These arguments are unfortunately backwards by mistake (bug #520169) */ + /* These arguments are unfortunately backwards by mistake (bug #520169). Deprecated in 2.20. */ GVolume * (* adopt_orphan_mount) (GMount *mount, GVolumeMonitor *volume_monitor); @@ -139,7 +139,9 @@ GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_mo GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid); +#ifndef G_DISABLE_DEPRECATED GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount); +#endif G_END_DECLS -- 2.7.4