[gtk+] Improve external drives detection
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Improve external drives detection
- Date: Fri, 20 May 2016 08:55:27 +0000 (UTC)
commit 55751fc6fbea74ca98b1dca6663046ba7974946a
Author: Ondrej Holy <oholy redhat com>
Date: Mon May 2 12:55:56 2016 +0200
Improve external drives detection
Use g_drive_is_removable for external drives detection. Current heuristic
fails in some cases (e.g. when removable drive is attached before login),
see Bug 765457.
Bump GLib version accordingly.
https://bugzilla.gnome.org/show_bug.cgi?id=765924
configure.ac | 4 ++--
gtk/gtkplacessidebar.c | 4 +---
gtk/gtkplacesview.c | 4 +---
3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8561c4e..0a0b14f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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], [45])
-m4_define([glib_required_micro], [8])
+m4_define([glib_required_minor], [49])
+m4_define([glib_required_micro], [1])
m4_define([glib_required_version],
[glib_required_major.glib_required_minor.glib_required_micro])
m4_define([glib_min_required_minor],
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 044439c..595fd38 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -877,9 +877,7 @@ is_external_volume (GVolume *volume)
is_external |= !id;
if (drive)
- is_external |= g_drive_can_eject (drive) ||
- g_drive_is_media_removable (drive) ||
- g_drive_can_stop (drive);
+ is_external |= g_drive_is_removable (drive);
g_clear_object (&drive);
g_free (id);
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 0bbf669..de13d24 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -475,9 +475,7 @@ is_external_volume (GVolume *volume)
is_external |= !id;
if (drive)
- is_external |= g_drive_can_eject (drive) ||
- g_drive_is_media_removable (drive) ||
- g_drive_can_stop (drive);
+ is_external |= g_drive_is_removable (drive);
g_clear_object (&drive);
g_free (id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]