summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-03-14 10:30:34 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-03-14 10:30:34 +0000
commitcfebb4f25968458489c41ace517e52de9708aee9 (patch)
treebb126fa4898192f203b314c1f69e35d08099fa41
parent091aa1c6c10a0799d52215a64aa89a3b6991d9f0 (diff)
downloadgvfs-cfebb4f25968458489c41ace517e52de9708aee9.tar.gz
Respect storage.automount_enabled_hint hal property (#520736) Patch from
2008-03-14 Alexander Larsson <alexl@redhat.com> * hal/ghalvolume.c (g_hal_volume_new): Respect storage.automount_enabled_hint hal property (#520736) Patch from Martin Pitt svn path=/trunk/; revision=1655
-rw-r--r--ChangeLog6
-rw-r--r--hal/ghalvolume.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f0e9dc6..ad4b98e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-03-14 Alexander Larsson <alexl@redhat.com>
+ * hal/ghalvolume.c (g_hal_volume_new):
+ Respect storage.automount_enabled_hint hal property (#520736)
+ Patch from Martin Pitt
+
+2008-03-14 Alexander Larsson <alexl@redhat.com>
+
* daemon/gvfsbackendsmb.c:
(set_info_from_stat):
Mark files with an initial dot to be hidden.
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));