Index: gio/ChangeLog
===================================================================
--- gio/ChangeLog	(revision 7575)
+++ gio/ChangeLog	(working copy)
@@ -1,3 +1,15 @@
+2008-10-06  David Zeuthen  <davidz@redhat.com>
+
+	The gio bits of the "connected server" feature (#555331)
+
+	* gio.symbols:
+	* gunionvolumemonitor.c:
+	* gvolumemonitor.h:
+	Deprecate g_volume_monitor_adopt_orphan_mount().
+
+	* gvolume.h:
+	Add new G_VOLUME_IDENTIFIER_KIND_CONNECTED_SERVER_PATH identifier.
+
 2008-10-06  Colin Walters  <walters@verbum.org>
 
 	Bug 554745 - GFileAttributeInfoList should be boxed
Index: gio/gvolumemonitor.h
===================================================================
--- gio/gvolumemonitor.h	(revision 7575)
+++ gio/gvolumemonitor.h	(working copy)
@@ -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_uu
 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
 
Index: gio/gunionvolumemonitor.c
===================================================================
--- gio/gunionvolumemonitor.c	(revision 7575)
+++ gio/gunionvolumemonitor.c	(working copy)
@@ -634,6 +634,11 @@ _g_mount_get_for_mount_path (const char *mount_pat
  *
  * 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)
Index: gio/gvolume.h
===================================================================
--- gio/gvolume.h	(revision 7575)
+++ gio/gvolume.h	(working copy)
@@ -67,6 +67,13 @@ G_BEGIN_DECLS
  */
 #define G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT "nfs-mount"
 
+/**
+ * G_VOLUME_IDENTIFIER_KIND_CONNECTED_SERVER_PATH:
+ *
+ * The string used to obtain the configuration path for connected
+ * servers with g_volume_get_identifier().
+ */
+#define G_VOLUME_IDENTIFIER_KIND_CONNECTED_SERVER_PATH "connected-server"
 
 #define G_TYPE_VOLUME            (g_volume_get_type ())
 #define G_VOLUME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VOLUME, GVolume))
Index: gio/gio.symbols
===================================================================
--- gio/gio.symbols	(revision 7575)
+++ gio/gio.symbols	(working copy)
@@ -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__)
