From 86b8db565cd09fc435f50049108aa15474ffa8e0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 4 Jan 2011 22:02:53 +0000 Subject: [PATCH] add some type detections for upcoming udisks/eeze support SVN revision: 55857 --- src/bin/e_fm_device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c index 8ec2dc00e..7ef6b4c3d 100644 --- a/src/bin/e_fm_device.c +++ b/src/bin/e_fm_device.c @@ -223,23 +223,24 @@ e_fm2_device_volume_add(E_Volume *v) icon = v->storage->icon.volume; else { - if (!strcmp(v->storage->drive_type, "disk")) + if ((!v->storage->drive_type) || (!strcmp(v->storage->drive_type, "disk"))) { if (v->storage->removable == 0) icon = "drive-harddisk"; else icon = "drive-removable-media"; } - else if (!strcmp(v->storage->drive_type, "cdrom")) + else if ((!strcmp(v->storage->drive_type, "cdrom")) || (!strncmp(v->storage->drive_type, "optical", 7))) icon = "drive-optical"; - else if (!strcmp(v->storage->drive_type, "floppy")) + else if (!strncmp(v->storage->drive_type, "floppy", 6)) icon = "media-floppy"; else if (!strcmp(v->storage->drive_type, "tape")) icon = "media-tape"; else if (!strcmp(v->storage->drive_type, "compact_flash") || !strcmp(v->storage->drive_type, "memory_stick") || !strcmp(v->storage->drive_type, "smart_media") - || !strcmp(v->storage->drive_type, "sd_mmc")) + || !strcmp(v->storage->drive_type, "sd_mmc") + || !strncmp(v->storage->drive_type, "flash", 5)) icon = "media-flash"; } if (icon) eina_stringshare_replace(&v->icon, icon);