gnome-volume-manager r1406 - in trunk: . src
- From: fejj svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-volume-manager r1406 - in trunk: . src
- Date: Tue, 23 Sep 2008 21:45:17 +0000 (UTC)
Author: fejj
Date: Tue Sep 23 21:45:17 2008
New Revision: 1406
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1406&view=rev
Log:
reverted previous patch since gnome is in code-freeze for 2.24.0
Modified:
trunk/ChangeLog
trunk/src/manager.c
Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c (original)
+++ trunk/src/manager.c Tue Sep 23 21:45:17 2008
@@ -1912,10 +1912,6 @@
GvmPromptCtx *ctx;
DBusError error;
- /* no-op for ignored volumes */
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", NULL))
- return;
-
dbus_error_init (&error);
if (!(device = libhal_device_get_property_string (hal_ctx, udi, "block.device", &error))) {
warn ("cannot get block.device: %s", error.message);
@@ -3121,10 +3117,6 @@
GSList *l, *n;
#endif
- /* don't add ignored volumes to our mounted_volumes list */
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", NULL))
- return;
-
if (strcmp (key, "volume.is_mounted") != 0)
return;
@@ -3172,7 +3164,7 @@
#ifdef ENABLE_AUTOMOUNT
g_hash_table_remove (device_table, udi);
- /* remove the volume from our mounted_volumes list if present */
+ /* unmount all volumes mounted during lifetime */
for (l = mounted_volumes; l != NULL; l = n) {
n = l->next;
if (strcmp (udi, (const char *) l->data) == 0) {
@@ -3221,12 +3213,6 @@
}
}
-#if 0
- /* don't handle ejects of ignored volumes */
- if (libhal_device_get_property_bool (hal_ctx, volume, "volume.ignore", NULL))
- goto done;
-#endif
-
dbg ("ejecting %s...\n", volume);
if (!gnome_mount || access (gnome_mount, F_OK | R_OK | X_OK) != 0) {
@@ -3564,9 +3550,7 @@
const char *udi = l->data;
dbg ("unmount_all: unmounting %s...\n", udi);
-
- if (!libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", NULL))
- gvm_device_unmount (udi);
+ gvm_device_unmount (udi);
}
}
#endif /* ENABLE_AUTOMOUNT */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]