[glib: 3/3] Merge branch 'wip/hadess/g-drive-identifier' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 6730309826d283895580011c5183418d5e92c657
Merge: 0b98fa5f3 75950d70c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon May 28 16:31:42 2018 +0000

    Merge branch 'wip/hadess/g-drive-identifier' into 'master'
    
    gio: Add G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE
    
    See merge request GNOME/glib!10

 docs/reference/gio/gio-sections.txt | 1 +
 gio/gdrive.c                        | 4 +++-
 gio/gdrive.h                        | 9 +++++++++
 gio/gvolume.c                       | 2 +-
 gio/gvolume.h                       | 4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)
---
diff --cc gio/gdrive.c
index af0df911f,d8c286793..7e75c802a
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@@ -611,9 -611,11 +611,11 @@@ g_drive_poll_for_media_finish (GDriv
   * @drive: a #GDrive
   * @kind: the kind of identifier to return
   *
-  * Gets the identifier of the given kind for @drive.
+  * Gets the identifier of the given kind for @drive. The only
+  * identifier currently available is
+  * #G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE.
   *
 - * Returns: a newly allocated string containing the
 + * Returns: (nullable) (transfer full): a newly allocated string containing the
   *     requested identfier, or %NULL if the #GDrive
   *     doesn't have this kind of identifier.
   */