glib r7594 - trunk/gio

[davidz svn gnome org]

Author: davidz
Date: Sun Oct 12 17:05:17 2008
New Revision: 7594
URL: http://svn.gnome.org/viewvc/glib?rev=7594&view=rev

Log:
2008-10-12  David Zeuthen  <davidz redhat com>

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



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gio.symbols
   trunk/gio/gunionvolumemonitor.c
   trunk/gio/gvolumemonitor.h

Modified: trunk/gio/gio.symbols
==============================================================================
--- trunk/gio/gio.symbols	(original)
+++ trunk/gio/gio.symbols	Sun Oct 12 17:05:17 2008
@@ -758,9 +758,11 @@
 #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__)

Modified: trunk/gio/gunionvolumemonitor.c
==============================================================================
--- trunk/gio/gunionvolumemonitor.c	(original)
+++ trunk/gio/gunionvolumemonitor.c	Sun Oct 12 17:05:17 2008
@@ -634,6 +634,11 @@
  *
  * 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)

Modified: trunk/gio/gvolumemonitor.h
==============================================================================
--- trunk/gio/gvolumemonitor.h	(original)
+++ trunk/gio/gvolumemonitor.h	Sun Oct 12 17:05:17 2008
@@ -109,7 +109,7 @@
                                       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 @@
 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