[Pkg-utopia-commits] r245 - packages/unstable/gnome-volume-manager/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-06-22 09:31:03 +0000 (Wed, 22 Jun 2005)
New Revision: 245

Added:
   packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch
Removed:
   packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch
Log:
Better naming, still need to be adapated for new upstream

Copied: packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch (from rev 219, packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch)

Deleted: packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch	2005-06-22 09:25:12 UTC (rev 244)
+++ packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch	2005-06-22 09:31:03 UTC (rev 245)
@@ -1,37 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-05-02 10:29:54.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-05-02 10:32:40.000000000 +0200
-@@ -971,9 +971,8 @@
- 	char **volumes;
- 	char *udi;
- 	char *device_file;
--
--	if (!config.automount_media)
--		return;
-+  char *drive_udi = NULL;
-+  gboolean do_mount;
- 
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {
-@@ -994,6 +993,21 @@
- 			    "filesystem") != 0)
- 			continue;
- 
-+    drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
-+
-+		do_mount = TRUE;
-+		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-+	      hal_device_get_property_bool(ctx, drive_udi, "storage.hotpluggable")) {
-+			do_mount = config.automount_drives;
-+		} else if (
-+        hal_device_property_exists(ctx, drive_udi, "storage.removable") &&
-+			  hal_device_get_property_bool(ctx, drive_udi, "storage.removable")) {
-+			do_mount = config.automount_media;
-+		} 
-+    hal_free_string(drive_udi);
-+    
-+    if (!do_mount) continue;
-+
- 		device_file = hal_device_get_property_string (ctx, udi,
- 							      "block.device");
-