Revert "Improve external drives detection"

This reverts commit a01ee5a7b0.

I didn't mean to bump the GLib requirement in the stable branch.
This commit is contained in:
Matthias Clasen
2016-08-04 12:49:21 -04:00
parent 84eff45a17
commit de9ba70e58
3 changed files with 8 additions and 4 deletions

View File

@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
m4_define([glib_required_major], [2])
m4_define([glib_required_minor], [49])
m4_define([glib_required_micro], [1])
m4_define([glib_required_minor], [45])
m4_define([glib_required_micro], [8])
m4_define([glib_required_version],
[glib_required_major.glib_required_minor.glib_required_micro])
m4_define([glib_min_required_minor],

View File

@@ -876,7 +876,9 @@ is_external_volume (GVolume *volume)
is_external |= !id;
if (drive)
is_external |= g_drive_is_removable (drive);
is_external |= g_drive_can_eject (drive) ||
g_drive_is_media_removable (drive) ||
g_drive_can_stop (drive);
g_clear_object (&drive);
g_free (id);

View File

@@ -474,7 +474,9 @@ is_external_volume (GVolume *volume)
is_external |= !id;
if (drive)
is_external |= g_drive_is_removable (drive);
is_external |= g_drive_can_eject (drive) ||
g_drive_is_media_removable (drive) ||
g_drive_can_stop (drive);
g_clear_object (&drive);
g_free (id);