[gvfs/mtp-backend: 41/64] MTP: Copy Storage type constants from ptp.h
- From: Philip Langdale <philipl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/mtp-backend: 41/64] MTP: Copy Storage type constants from ptp.h
- Date: Sat, 12 Jan 2013 04:37:35 +0000 (UTC)
commit e491a5df9c3956f5d597d6e7d5650d3bd033253e
Author: Philip Langdale <philipl overt org>
Date: Sat Oct 13 14:33:42 2012 -0700
MTP: Copy Storage type constants from ptp.h
daemon/gvfsbackendmtp.c | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gvfsbackendmtp.c b/daemon/gvfsbackendmtp.c
index ea59f2e..c9389c1 100644
--- a/daemon/gvfsbackendmtp.c
+++ b/daemon/gvfsbackendmtp.c
@@ -89,7 +89,21 @@ DEBUG_ENUMERATE (const gchar *message, ...)
#endif
}
-/* ------------------------------------------------------------------------------------------------- */
+
+/************************************************
+ * Storage constants copied from ptp.h
+ *
+ * ptp.h is treated as a private header by libmtp
+ ************************************************/
+
+/* PTP Storage Types */
+
+#define PTP_ST_Undefined 0x0000
+#define PTP_ST_FixedROM 0x0001
+#define PTP_ST_RemovableROM 0x0002
+#define PTP_ST_FixedRAM 0x0003
+#define PTP_ST_RemovableRAM 0x0004
+
/************************************************
* Initialization
@@ -573,18 +587,19 @@ get_storage_info(LIBMTP_devicestorage_t *storage, GFileInfo *info) {
GIcon *icon;
switch (storage->StorageType) {
- case 1:
+ case PTP_ST_FixedROM:
g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, TRUE);
icon = g_themed_icon_new_with_default_fallbacks ("drive-harddisk");
break;
- case 2:
+ case PTP_ST_RemovableROM:
g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, TRUE);
icon = g_themed_icon_new_with_default_fallbacks ("media-memory-sd");
break;
- case 4:
+ case PTP_ST_RemovableRAM:
g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, FALSE);
icon = g_themed_icon_new_with_default_fallbacks ("media-memory-sd");
break;
+ case PTP_ST_FixedRAM:
default:
g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, FALSE);
icon = g_themed_icon_new_with_default_fallbacks ("drive-harddisk");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]