hal/libhal-storage libhal-storage.c,1.25,1.26

[David Zeuthen]

Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv20411/libhal-storage

Modified Files:
	libhal-storage.c 
Log Message:
2006-01-15  David Zeuthen  <davidz at redhat.com>

        * libhal-storage/libhal-storage.c (libhal_volume_from_udi): Auch,
        volume.fsusage may be an empty string and our string extraction
        macro then yields NULL. Hence vol->fsusage is never set and just
        left as a 0 from the memset meaning _USAGE_MOUNTABLE_FILESYSTEM.
        Thus, gnome-vfs thinks the volume is mountable and displays it.
        Fix this by initializing vol->fsuage to _USAGE_UNKNOWN.



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- libhal-storage.c	9 Jan 2006 15:19:50 -0000	1.25
+++ libhal-storage.c	15 Jan 2006 15:33:48 -0000	1.26
@@ -1094,6 +1094,7 @@
 		}
 	}
 
+	vol->fsusage = LIBHAL_VOLUME_USAGE_UNKNOWN;
 	if (vol_fsusage_textual != NULL) {
 		if (strcmp (vol_fsusage_textual, "filesystem") == 0) {
 			vol->fsusage = LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM;