summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@enlightenment.org>2013-11-21 15:50:37 -0500
committerMike Blumenkrantz <zmike@enlightenment.org>2013-11-21 15:59:33 -0500
commitf43c8548e6bb5733fe4344e4045a0c4f24a12e8d (patch)
tree879393a37ef44ab0612a089c17b3dc506a76c504
parente3d2706ac5882f3a803a82fa26d832fe143c2b12 (diff)
apply HintSystem to volume validation check
-rw-r--r--src/bin/e_fm/e_fm_main_udisks2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index 139034e24..be5dca743 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -72,6 +72,7 @@ typedef struct U2_Block
72 Eina_Stringshare *IdLabel; 72 Eina_Stringshare *IdLabel;
73 Eina_Stringshare *IdUUID; 73 Eina_Stringshare *IdUUID;
74 Eina_Bool HintIgnore; 74 Eina_Bool HintIgnore;
75 Eina_Bool HintSystem;
75 Eina_Stringshare *HintName; 76 Eina_Stringshare *HintName;
76 Eina_Stringshare *HintIconName; 77 Eina_Stringshare *HintIconName;
77} U2_Block; 78} U2_Block;
@@ -176,7 +177,7 @@ _e_fm_main_udisks2_storage_block_add(E_Storage *s, U2_Block *u2)
176static void 177static void
177_e_fm_main_udisks2_volume_block_add(E_Volume *v, U2_Block *u2) 178_e_fm_main_udisks2_volume_block_add(E_Volume *v, U2_Block *u2)
178{ 179{
179 v->validated = u2->volume && u2->Device && u2->parent; 180 v->validated = u2->volume && u2->Device && u2->parent && (!u2->HintSystem);
180 if (!v->validated) return; 181 if (!v->validated) return;
181 v->size = u2->Size; 182 v->size = u2->Size;
182 eina_stringshare_replace(&v->udi, u2->Device); 183 eina_stringshare_replace(&v->udi, u2->Device);
@@ -270,6 +271,8 @@ _e_fm_main_udisks2_block_handle(Eldbus_Message_Iter *arr3, U2_Block *u2)
270 u2->IdUUID = eina_stringshare_add(val); 271 u2->IdUUID = eina_stringshare_add(val);
271 else if (!strcmp(key2, "HintIgnore")) 272 else if (!strcmp(key2, "HintIgnore"))
272 u2->HintIgnore = !!b; 273 u2->HintIgnore = !!b;
274 else if (!strcmp(key2, "HintSystem"))
275 u2->HintSystem = !!b;
273 else if (!strcmp(key2, "HintName")) 276 else if (!strcmp(key2, "HintName"))
274 u2->HintName = eina_stringshare_add(val); 277 u2->HintName = eina_stringshare_add(val);
275 else if (!strcmp(key2, "HintIconName")) 278 else if (!strcmp(key2, "HintIconName"))