[Pkg-utopia-commits] r255 - packages/experimental/gnome-volume-manager/debian/patches

Sjoerd Simons sjoerd@costa.debian.org
Wed, 22 Jun 2005 14:58:11 +0000


Author: sjoerd
Date: 2005-06-22 14:58:11 +0000 (Wed, 22 Jun 2005)
New Revision: 255

Modified:
   packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch
   packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch
Log:
s/fusage/fsuage/g and s/libhal_string_free/libhal_free_string/

Modified: packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch	2005-06-22 13:46:37 UTC (rev 254)
+++ packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch	2005-06-22 14:58:11 UTC (rev 255)
@@ -170,7 +170,7 @@
 +
 +	if (libhal_device_property_exists (hal_ctx, udi, "volume.fsusage", NULL)) {
 +		fsusage = 
-+			libhal_device_get_property_string (hal_ctx, udi, "volume.fusage", NULL);
++			libhal_device_get_property_string (hal_ctx, udi, "volume.fsusage", NULL);
 +	}
 +
 +	/* Check for encrypted device */
@@ -196,13 +196,13 @@
 -							       NULL), 
 -			    "filesystem") != 0) 
 +		if (libhal_device_property_exists (ctx, udi, "volume.fsusage", NULL)) {
-+			gchar *fusage = 
++			gchar *fsusage = 
 +				libhal_device_get_property_string (ctx, udi, "volume.fsusage", NULL);
 +			if(strcmp(fsusage, "filesystem") && strcmp(fsusage, "crypto")) {
-+				libhal_string_free(fsusage);
++				libhal_free_string(fsusage);
 +				continue;
 +			}
-+			libhal_string_free(fsusage);
++			libhal_free_string(fsusage);
 +		} else {
  			continue;
 +		}

Modified: packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch	2005-06-22 13:46:37 UTC (rev 254)
+++ packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch	2005-06-22 14:58:11 UTC (rev 255)
@@ -59,9 +59,9 @@
  
  	if (libhal_device_property_exists (hal_ctx, udi, "volume.fsusage", NULL)) {
  		fsusage = 
- 			libhal_device_get_property_string (hal_ctx, udi, "volume.fusage", NULL);
+ 			libhal_device_get_property_string (hal_ctx, udi, "volume.fsusage", NULL);
 +	} else {
-+		return FALSE
++		return FALSE;
  	}
  
  	/* Check for encrypted device */