Author: benny
Date: 2007-01-07 23:10:41 +0000 (Sun, 07 Jan 2007)
New Revision: 24301
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c
thunar/trunk/thunar-vfs/thunar-vfs-volume.c
thunar/trunk/thunar-vfs/thunar-vfs-volume.h
Log:
2007-01-08 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar-vfs/thunar-vfs-volume-hal.c,
thunar-vfs/thunar-vfs-volume.{c,h}: Add support for memory cards and
generic removable disk drives. Bug #2652.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2007-01-07 22:58:40 UTC (rev 24300)
+++ thunar/trunk/ChangeLog 2007-01-07 23:10:41 UTC (rev 24301)
@@ -1,3 +1,9 @@
+2007-01-08 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * thunar-vfs/thunar-vfs-volume-hal.c,
+ thunar-vfs/thunar-vfs-volume.{c,h}: Add support for memory cards and
+ generic removable disk drives. Bug #2652.
+
2007-01-07 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar-vfs/Makefile.am, thunar-vfs/thunar-vfs-volume-hal.c,
Modified: thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c 2007-01-07 22:58:40 UTC
(rev 24300)
+++ thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c 2007-01-07 23:10:41 UTC
(rev 24301)
@@ -571,6 +571,11 @@
volume_hal->kind = THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER;
break;
+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
+ case LIBHAL_DRIVE_TYPE_SD_MMC:
+ volume_hal->kind = THUNAR_VFS_VOLUME_KIND_MEMORY_CARD;
+ break;
+
default:
/* check if the drive is connected to the USB bus */
if (libhal_drive_get_bus (hd) == LIBHAL_DRIVE_BUS_USB)
@@ -578,6 +583,11 @@
/* we consider the drive to be an USB stick */
volume_hal->kind = THUNAR_VFS_VOLUME_KIND_USBSTICK;
}
+ else if (libhal_drive_uses_removable_media (hd))
+ {
+ /* fallback to generic removable disk */
+ volume_hal->kind = THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK;
+ }
else
{
/* fallback to harddisk drive */
Modified: thunar/trunk/thunar-vfs/thunar-vfs-volume.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-volume.c 2007-01-07 22:58:40 UTC (rev
24300)
+++ thunar/trunk/thunar-vfs/thunar-vfs-volume.c 2007-01-07 23:10:41 UTC (rev
24301)
@@ -335,6 +335,8 @@
case THUNAR_VFS_VOLUME_KIND_USBSTICK:
case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
+ case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
+ case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
return TRUE;
default:
@@ -451,6 +453,12 @@
if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
return "gnome-dev-cdrom-audio";
goto cdrom;
+
+ case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
+ case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
+ if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
+ return "gnome-dev-removable";
+ break;
default:
break;
Modified: thunar/trunk/thunar-vfs/thunar-vfs-volume.h
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-volume.h 2007-01-07 22:58:40 UTC (rev
24300)
+++ thunar/trunk/thunar-vfs/thunar-vfs-volume.h 2007-01-07 23:10:41 UTC (rev
24301)
@@ -39,21 +39,23 @@
/**
* ThunarVfsVolumeKind:
- * @THUNAR_VFS_VOLUME_KIND_UNKNOWN : Unknown volume.
- * @THUNAR_VFS_VOLUME_KIND_CDROM : CD-ROMs.
- * @THUNAR_VFS_VOLUME_KIND_CDR : CD-Rs.
- * @THUNAR_VFS_VOLUME_KIND_CDRW : CD-RWs.
- * @THUNAR_VFS_VOLUME_KIND_DVDROM : DVD-ROMs.
- * @THUNAR_VFS_VOLUME_KIND_DVDRAM : DVD-RAMs.
- * @THUNAR_VFS_VOLUME_KIND_DVDR : DVD-Rs.
- * @THUNAR_VFS_VOLUME_KIND_DVDRW : DVD-RWs.
- * @THUNAR_VFS_VOLUME_KIND_DVDPLUSR : DVD+Rs.
- * @THUNAR_VFS_VOLUME_KIND_DVDPLUSRW : DVD+RWs.
- * @THUNAR_VFS_VOLUME_KIND_FLOPPY : Floppy drives.
- * @THUNAR_VFS_VOLUME_KIND_HARDDISK : Hard disk drives.
- * @THUNAR_VFS_VOLUME_KIND_USBSTICK : USB sticks.
- * @THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER : Portable audio players (i.e. iPod).
- * @THUNAR_VFS_VOLUME_KIND_AUDIO_CD : Audio CDs.
+ * @THUNAR_VFS_VOLUME_KIND_UNKNOWN : Unknown volume.
+ * @THUNAR_VFS_VOLUME_KIND_CDROM : CD-ROMs.
+ * @THUNAR_VFS_VOLUME_KIND_CDR : CD-Rs.
+ * @THUNAR_VFS_VOLUME_KIND_CDRW : CD-RWs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDROM : DVD-ROMs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDRAM : DVD-RAMs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDR : DVD-Rs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDRW : DVD-RWs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDPLUSR : DVD+Rs.
+ * @THUNAR_VFS_VOLUME_KIND_DVDPLUSRW : DVD+RWs.
+ * @THUNAR_VFS_VOLUME_KIND_FLOPPY : Floppy drives.
+ * @THUNAR_VFS_VOLUME_KIND_HARDDISK : Hard disk drives.
+ * @THUNAR_VFS_VOLUME_KIND_USBSTICK : USB sticks.
+ * @THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER : Portable audio players (i.e. iPod).
+ * @THUNAR_VFS_VOLUME_KIND_AUDIO_CD : Audio CDs.
+ * @THUNAR_VFS_VOLUME_KIND_MEMORY_CARD : Memory cards.
+ * @THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK : Other removable disks.
*
* Describes the type of a VFS volume.
**/
@@ -74,6 +76,8 @@
THUNAR_VFS_VOLUME_KIND_USBSTICK,
THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER,
THUNAR_VFS_VOLUME_KIND_AUDIO_CD,
+ THUNAR_VFS_VOLUME_KIND_MEMORY_CARD,
+ THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK,
} ThunarVfsVolumeKind;
/**
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
