[gvfs/wip/udisks2: 8/8] Use comment=gvfs-name=VALUE and comment=gvfs-icon=VALUE
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/wip/udisks2: 8/8] Use comment=gvfs-name=VALUE and comment=gvfs-icon=VALUE
- Date: Mon, 12 Dec 2011 22:14:46 +0000 (UTC)
commit 08e3b0b98c6c52b802b78405dfe9553e6af8396f
Author: David Zeuthen <davidz redhat com>
Date: Mon Dec 12 17:12:58 2011 -0500
Use comment=gvfs-name=VALUE and comment=gvfs-icon=VALUE
We really just want to use x-gvfs-name and x-gvfs-icon that a future
util-linux release is guaranteed to support. But it doesn't look like
this is supported right now.
Signed-off-by: David Zeuthen <davidz redhat com>
monitor/udisks2/gvfsudisks2volume.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index dd68329..2415452 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -159,14 +159,14 @@ apply_options_from_fstab (GVfsUDisks2Volume *volume,
gchar *name;
gchar *icon_name;
- name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs.name=");
+ name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs-name=");
if (name != NULL)
{
g_free (volume->name);
volume->name = name;
}
- icon_name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs.icon_name=");
+ icon_name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs-icon=");
if (icon_name != NULL)
{
volume->icon = g_themed_icon_new_with_default_fallbacks (icon_name);
@@ -328,7 +328,7 @@ update_volume (GVfsUDisks2Volume *volume)
volume->icon = g_themed_icon_new_with_default_fallbacks (hint);
}
- /* Use comment=gvfs.name=The%20Name and comment=gvfs.icon_name=foo-name, if available */
+ /* Use comment=gvfs-name=The%20Name and comment=gvfs-icon=foo-name, if available */
g_variant_iter_init (&iter, udisks_block_get_configuration (block));
while (g_variant_iter_next (&iter, "(&s a{sv})", &configuration_type, &configuration_value))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]