Merge branch 'w32-mount-sort' into 'master'

GWin32VolumeMonitor: Sort the volumes correctly

See merge request GNOME/glib!669
This commit is contained in:
Philip Withnall 2019-02-13 16:41:14 +00:00
commit 843a0422ab

View File

@ -111,7 +111,7 @@ get_mounts (GVolumeMonitor *volume_monitor)
{
DWORD drives;
gchar drive[4] = "A:\\";
GList *list = NULL;
GQueue queue = G_QUEUE_INIT;
drives = get_viewable_logical_drives ();
@ -121,13 +121,13 @@ get_mounts (GVolumeMonitor *volume_monitor)
while (drives && drive[0] <= 'Z')
{
if (drives & 1)
{
list = g_list_prepend (list, _g_win32_mount_new (volume_monitor, drive, NULL));
}
g_queue_push_tail (&queue, _g_win32_mount_new (volume_monitor, drive, NULL));
drives >>= 1;
drive[0]++;
}
return list;
return g_steal_pointer (&queue.head);
}
/* actually 'mounting' volumes is out of GIOs business on win32, so no volumes are delivered either */