hal/libhal-storage libhal-storage.c, 1.8, 1.9 libhal-storage.h, 1.6, 1.7

[David Zeuthen]

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

Modified Files:
	libhal-storage.c libhal-storage.h 
Log Message:
2004-12-13  David Zeuthen  <davidz at redhat.com>

	Merged all changes from the stable branch so HEAD is on par.



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libhal-storage.c	18 Oct 2004 23:49:57 -0000	1.8
+++ libhal-storage.c	14 Dec 2004 02:57:48 -0000	1.9
@@ -258,7 +258,7 @@
 
 
 		first = "CD-ROM";
-		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDROM)
+		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDR)
 			first = "CD-R";
 		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDRW)
 			first = "CD-RW";
@@ -870,7 +870,16 @@
 			drive->type = HAL_DRIVE_TYPE_SMART_MEDIA;
 		} else if (strcmp (drive->type_textual, "sd_mmc") == 0) {
 			drive->type = HAL_DRIVE_TYPE_SD_MMC;
+/*
+		} else if (strcmp (drive->type_textual, "zip") == 0) {
+			drive->type = HAL_DRIVE_TYPE_ZIP;
+		} else if (strcmp (drive->type_textual, "jaz") == 0) {
+			drive->type = HAL_DRIVE_TYPE_JAZ;
+*/
+		} else {
+		        drive->type = HAL_DRIVE_TYPE_DISK; 
 		}
+
 	}
 
 	/* check if physical device is a camera or mp3 player */

Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libhal-storage.h	13 Oct 2004 18:50:45 -0000	1.6
+++ libhal-storage.h	14 Dec 2004 02:57:48 -0000	1.7
@@ -78,6 +78,8 @@
 	HAL_STORAGE_ICON_DRIVE_SD_MMC                   = 0x10800,
 	HAL_STORAGE_ICON_DRIVE_CAMERA                   = 0x10900,
 	HAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER    = 0x10a00,
+/*	HAL_STORAGE_ICON_DRIVE_ZIP                      = 0x10b00,
+        HAL_STORAGE_ICON_DRIVE_JAZ                      = 0x10c00,*/
 
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK          = 0x20000,
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE      = 0x20001,
@@ -106,6 +108,8 @@
 	HAL_STORAGE_ICON_VOLUME_SD_MMC                  = 0x20800,
 	HAL_STORAGE_ICON_VOLUME_CAMERA                  = 0x20900,
 	HAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER   = 0x20a00,
+/*	HAL_STORAGE_ICON_VOLUME_ZIP                     = 0x10b00,
+        HAL_STORAGE_ICON_VOLUME_JAZ                     = 0x10c00,*/
 
 	HAL_STORAGE_ICON_DISC_CDROM                     = 0x30000,
 	HAL_STORAGE_ICON_DISC_CDR                       = 0x30001,
@@ -150,7 +154,9 @@
 	HAL_DRIVE_TYPE_SMART_MEDIA           = 0x07,
 	HAL_DRIVE_TYPE_SD_MMC                = 0x08,
 	HAL_DRIVE_TYPE_CAMERA                = 0x09,
-	HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a
+	HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a/*,
+	HAL_DRIVE_TYPE_ZIP                   = 0x0b,
+	HAL_DRIVE_TYPE_JAZ                   = 0x0c*/
 } HalDriveType;
 
 typedef enum {