| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 |
| 2 | From: David Zeuthen <davidz@redhat.com> |
| 3 | Date: Fri, 8 Jul 2011 11:03:52 -0400 |
| 4 | Subject: [PATCH] Add support for DeviceAutomountHint |
| 5 | |
| 6 | Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 |
| 7 | |
| 8 | Upstream-Status: Applied [1] |
| 9 | |
| 10 | [1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html |
| 11 | |
| 12 | Signed-off-by: David Zeuthen <davidz@redhat.com> |
| 13 | --- |
| 14 | src/gdu/gdu-device.c | 10 ++++++++++ |
| 15 | src/gdu/gdu-device.h | 1 + |
| 16 | 2 files changed, 11 insertions(+), 0 deletions(-) |
| 17 | |
| 18 | diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c |
| 19 | index 6a5afad..4be39cf 100644 |
| 20 | --- a/src/gdu/gdu-device.c |
| 21 | +++ b/src/gdu/gdu-device.c |
| 22 | @@ -82,6 +82,7 @@ typedef struct |
| 23 | gboolean device_presentation_nopolicy; |
| 24 | char *device_presentation_name; |
| 25 | char *device_presentation_icon_name; |
| 26 | + char *device_automount_hint; |
| 27 | guint64 device_size; |
| 28 | guint64 device_block_size; |
| 29 | |
| 30 | @@ -279,6 +280,8 @@ collect_props (const char *key, |
| 31 | props->device_presentation_name = g_strdup (g_value_get_string (value)); |
| 32 | else if (strcmp (key, "DevicePresentationIconName") == 0) |
| 33 | props->device_presentation_icon_name = g_strdup (g_value_get_string (value)); |
| 34 | + else if (strcmp (key, "DeviceAutomountHint") == 0) |
| 35 | + props->device_automount_hint = g_strdup (g_value_get_string (value)); |
| 36 | else if (strcmp (key, "DeviceSize") == 0) |
| 37 | props->device_size = g_value_get_uint64 (value); |
| 38 | else if (strcmp (key, "DeviceBlockSize") == 0) |
| 39 | @@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props) |
| 40 | g_strfreev (props->device_mount_paths); |
| 41 | g_free (props->device_presentation_name); |
| 42 | g_free (props->device_presentation_icon_name); |
| 43 | + g_free (props->device_automount_hint); |
| 44 | g_free (props->job_id); |
| 45 | g_free (props->id_usage); |
| 46 | g_free (props->id_type); |
| 47 | @@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device) |
| 48 | } |
| 49 | |
| 50 | const char * |
| 51 | +gdu_device_get_automount_hint (GduDevice *device) |
| 52 | +{ |
| 53 | + return device->priv->props->device_automount_hint; |
| 54 | +} |
| 55 | + |
| 56 | +const char * |
| 57 | gdu_device_drive_get_media (GduDevice *device) |
| 58 | { |
| 59 | return device->priv->props->drive_media; |
| 60 | diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h |
| 61 | index 4c1302b..8cfd7a9 100644 |
| 62 | --- a/src/gdu/gdu-device.h |
| 63 | +++ b/src/gdu/gdu-device.h |
| 64 | @@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device); |
| 65 | const char *gdu_device_drive_get_connection_interface (GduDevice *device); |
| 66 | guint64 gdu_device_drive_get_connection_speed (GduDevice *device); |
| 67 | char **gdu_device_drive_get_media_compatibility (GduDevice *device); |
| 68 | +const gchar *gdu_device_get_automount_hint(GduDevice *device); |
| 69 | const char *gdu_device_drive_get_media (GduDevice *device); |
| 70 | gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device); |
| 71 | gboolean gdu_device_drive_get_requires_eject (GduDevice *device); |
| 72 | -- |
| 73 | 1.7.6.5 |
| 74 | |