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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-19 06:21:59 -0700 (Fri, 19 Nov 2004)
New Revision: 110

Modified:
   packages/gnome-volume-manager/trunk/debian/patches/25_improve_mounting.patch
Log:
Improve debugging messages

Modified: packages/gnome-volume-manager/trunk/debian/patches/25_improve_mounting.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/25_improve_mounting.patch	2004-11-19 12:59:55 UTC (rev 109)
+++ packages/gnome-volume-manager/trunk/debian/patches/25_improve_mounting.patch	2004-11-19 13:21:59 UTC (rev 110)
@@ -1,6 +1,6 @@
 diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
 --- gnome-volume-manager-old/src/manager.c	2004-11-19 13:27:47.299259000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-19 13:55:09.235092324 +0100
++++ gnome-volume-manager/src/manager.c	2004-11-19 14:11:09.564039480 +0100
 @@ -491,6 +491,27 @@
  	hal_free_string (mount_point);
  }
@@ -29,7 +29,7 @@
  /*
   * gvm_device_mount - use BIN_MOUNT to mount the given device node.
   *
-@@ -500,9 +521,46 @@
+@@ -500,9 +521,47 @@
   * @return TRUE iff the mount was succesful
   */
  static gboolean
@@ -40,7 +40,8 @@
 +    gboolean ret = FALSE;
 +    /* don't attempt to mount if the automount_hint is false */
 +    if (gvm_is_manual_mount(hal_ctx, udi)) {
-+      dbg("%s has storage.automount_enabled_hint == false, not mounting", udi);
++      dbg("%s has storage.automount_enabled_hint == false, not mounting\n"
++          , udi);
 +      return FALSE;
 +    }
 +		/* don't attempt to mount already mounted volumes */
@@ -48,7 +49,7 @@
 +						"volume.is_mounted") ||
 +		    hal_device_get_property_bool (hal_ctx, udi, 
 +						  "volume.is_mounted")) {
-+        dbg("%s already mounted, not mounting again", udi);
++        dbg("%s already mounted, not mounting again\n", udi);
 +			return FALSE;
 +    }
 +
@@ -60,7 +61,7 @@
 +							    "volume.fsusage"), "filesystem") != 0 
 +         && strcmp (hal_device_get_property_string (hal_ctx, udi,
 +                               "volume.fsusage"), "") != 0)) {
-+        dbg("%s isn't use as a filesystem\n", udi);
++        dbg("%s isn't a filesystem\n", udi);
 +      return FALSE;
 +    }
 +
@@ -78,7 +79,7 @@
  }
  
  /*
-@@ -572,8 +630,7 @@
+@@ -572,8 +631,7 @@
  
  	switch (action) {
  	case MOUNT:
@@ -88,7 +89,7 @@
  		break;
  	case PLAY:
  		gvm_run_cdplayer (device, device, udi);
-@@ -649,8 +706,7 @@
+@@ -649,8 +707,7 @@
  		gvm_ask_mixed (udi);
  	} else if (has_data) {
  		if (config.automount_media) {
@@ -98,7 +99,7 @@
  		}
  	} else if (is_blank) {
  		if (gvm_device_is_writer (drive_udi))
-@@ -707,8 +763,7 @@
+@@ -707,8 +764,7 @@
  		dbg ("Added: %s\n", device);
  		
  		if (config.automount_drives) {
@@ -108,7 +109,7 @@
  		}
  	}
  
-@@ -771,8 +826,7 @@
+@@ -771,8 +827,7 @@
  	dbg ("Added: %s\n", device);
  	
  	if (config.automount_drives) {
@@ -118,7 +119,7 @@
  	}
  	
  out:
-@@ -845,10 +899,6 @@
+@@ -845,10 +900,6 @@
  
  		dbg ("Mounted: %s\n", udi);
  
@@ -129,7 +130,7 @@
  		policy_udi = g_slist_find_custom (mounted_volumes_policy_queue, 
  						  udi, 
  						  (GCompareFunc)g_ascii_strcasecmp);
-@@ -1022,22 +1072,6 @@
+@@ -1022,22 +1073,6 @@
  	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
  	for (i = 0; i < num_volumes; i++) {
  		udi = volumes [i];
@@ -152,7 +153,7 @@
      drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
  
  		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-@@ -1059,7 +1093,7 @@
+@@ -1059,7 +1094,7 @@
  
  			dbg ("mount_all: mounting %s\n", device_file);