Page MenuHomeFreeBSD
Differential D25279 Diff 74947 devel/glib20/files/patch-gio_gunixvolume.c

Changeset View

Standalone View

View Options

devel/glib20/files/patch-gio_gunixvolume.c

--- gio/gunixvolume.c.orig 2014-03-20 04:50:45.000000000 +0100 --- gio/gunixvolume.c.orig 2020-06-15 12:26:27 UTC
+++ gio/gunixvolume.c 2014-03-24 20:44:40.000000000 +0100 +++ gio/gunixvolume.c
@@ -356,9 +356,14 @@ @@ -365,9 +365,15 @@ g_unix_volume_eject (GVolume *volume,
gpointer user_data) gpointer user_data)
{ {
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume); GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
+#ifdef __FreeBSD__ +#ifdef __FreeBSD__
+ const gchar *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; + const gchar *argv[] = { "cdcontrol", "-f", NULL, NULL };
+
+ argv[2] = unix_volume->device_path; + argv[2] = unix_volume->device_path;
+#else +#else
const gchar *argv[] = { "eject", NULL, NULL }; const gchar *argv[] = { "eject", NULL, NULL };
argv[1] = unix_volume->device_path; argv[1] = unix_volume->device_path;
+#endif +#endif
eject_mount_do (volume, cancellable, callback, user_data, argv); eject_mount_do (volume, cancellable, callback, user_data, argv);
} }