[gvfs] udisks2: ensure that encrypted loop devices also get padlock emblem
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] udisks2: ensure that encrypted loop devices also get padlock emblem
- Date: Thu, 26 Jul 2012 20:45:19 +0000 (UTC)
commit 256e33d3c21c0b5b495078c901111eb872d6d36a
Author: David Zeuthen <zeuthen gmail com>
Date: Thu Jul 26 16:43:02 2012 -0400
udisks2: ensure that encrypted loop devices also get padlock emblem
Signed-off-by: David Zeuthen <zeuthen gmail com>
monitor/udisks2/gvfsudisks2volume.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index 7bf0875..21da468 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -398,11 +398,15 @@ update_volume (GVfsUDisks2Volume *volume)
}
/* Add an emblem, depending on whether the encrypted volume is locked or unlocked */
- if (g_strcmp0 (udisks_block_get_id_type (volume->block), "crypto_LUKS") == 0 && volume->icon != NULL)
+ if (g_strcmp0 (udisks_block_get_id_type (volume->block), "crypto_LUKS") == 0)
{
GEmblem *emblem;
GIcon *padlock;
GIcon *emblemed_icon;
+
+ if (volume->icon == NULL)
+ volume->icon = g_themed_icon_new ("drive-removable-media");
+
if (cleartext_block != NULL)
padlock = g_themed_icon_new ("changes-allow");
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]