From cfebb4f25968458489c41ace517e52de9708aee9 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 14 Mar 2008 10:30:34 +0000 Subject: Respect storage.automount_enabled_hint hal property (#520736) Patch from 2008-03-14 Alexander Larsson * hal/ghalvolume.c (g_hal_volume_new): Respect storage.automount_enabled_hint hal property (#520736) Patch from Martin Pitt svn path=/trunk/; revision=1655 --- ChangeLog | 6 ++++++ hal/ghalvolume.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7f0e9dc6..ad4b98e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-14 Alexander Larsson + + * hal/ghalvolume.c (g_hal_volume_new): + Respect storage.automount_enabled_hint hal property (#520736) + Patch from Martin Pitt + 2008-03-14 Alexander Larsson * daemon/gvfsbackendsmb.c: diff --git a/hal/ghalvolume.c b/hal/ghalvolume.c index 8cc18bbd..076147a1 100644 --- a/hal/ghalvolume.c +++ b/hal/ghalvolume.c @@ -568,6 +568,11 @@ g_hal_volume_new (GVolumeMonitor *volume_monitor, return NULL; } + if (drive_device && + hal_device_has_property (drive_device, "storage.automount_enabled_hint") && + !hal_device_get_property_bool (drive_device, "storage.automount_enabled_hint")) + ignore_automount = TRUE; + volume = g_object_new (G_TYPE_HAL_VOLUME, NULL); volume->volume_monitor = volume_monitor; g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(volume->volume_monitor)); -- cgit v1.2.1