[Pkg-utopia-commits] r202 - packages/gnome-volume-manager/trunk/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-05-02 10:09:00 +0000 (Mon, 02 May 2005)
New Revision: 202

Modified:
   packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
   packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
Log:
Also try to mount non-removable media on startup

Modified: packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch	2005-04-29 11:46:21 UTC (rev 201)
+++ packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch	2005-05-02 10:09:00 UTC (rev 202)
@@ -1,7 +1,7 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c	2004-11-18 15:04:36.348949000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-18 15:04:36.562962730 +0100
-@@ -969,9 +969,8 @@
+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;
@@ -13,12 +13,13 @@
  
  	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
  	for (i = 0; i < num_volumes; i++) {
-@@ -995,6 +994,20 @@
- 		if (gvm_is_manual_mount(ctx, udi)) 
+@@ -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;

Modified: packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch	2005-04-29 11:46:21 UTC (rev 201)
+++ packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch	2005-05-02 10:09:00 UTC (rev 202)
@@ -27,12 +27,3 @@
  	gtk_dialog_add_buttons (GTK_DIALOG (askme),
  				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
  				_("_Run Command"), GTK_RESPONSE_ACCEPT,
-@@ -1124,7 +1123,7 @@
- 	char *udi;
- 	char *device_file;
-   char *drive_udi = NULL;
--  gboolean do_mount;
-+  gboolean do_mount = FALSE;
- 
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {