Deprecate g_volume_monitor_adopt_orphan_mount() (#555331).

2008-10-12  David Zeuthen  <davidz@redhat.com>

        * gio.symbols:
        * gunionvolumemonitor.c:
        * gvolumemonitor.h:
        Deprecate g_volume_monitor_adopt_orphan_mount() (#555331).

svn path=/trunk/; revision=7594

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 744cd41acef2e3d5a40a2b4fb802850e18560586..62048ce9be8ec06f93c7abb43ff7c930e73ab48d 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-12  David Zeuthen  <davidz@redhat.com>
+
+       * gio.symbols:
+       * gunionvolumemonitor.c:
+       * gvolumemonitor.h:
+       Deprecate g_volume_monitor_adopt_orphan_mount() (#555331).
+
 2008-10-10  Alexander Larsson  <alexl@redhat.com>
 
        * gfileattribute.c (escape_byte_string):

diff --git a/gio/gio.symbols b/gio/gio.symbols
index 2e49f539c9866874dfa6edbad2b9f99f5823f74a..36b43e184c53c10d4c540fd6c148cbe439d37852 100644 (file)
--- 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 8009262a5f7c6cfd407bd15491b98d0cfcfa51f4..f12ecd905e96f5b68968f6205fbdf6ab38b4c6e9 100644 (file)
--- 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 6c9f71241f209dfbb16fb352eaa721d9786e4989..4d286f1015ab23361f1902f23431723e3965f9ab 100644 (file)
--- 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