[gnome-disk-utility] For mount options, switch from comment=gvfs to x-gvfs

[David Zeuthen <davidz src gnome org>]

commit f754e912526b6f3aef0ac0975beb1eafa886e4fb
Author: David Zeuthen <davidz redhat com>
Date:   Tue Jan 24 16:40:29 2012 -0500

    For mount options, switch from comment=gvfs to x-gvfs
    
    Recent util-linux (2.21+) supports any x-* option.
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 data/ui/edit-fstab-dialog.ui    |   10 +++++-----
 src/palimpsest/gdufstabdialog.c |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/ui/edit-fstab-dialog.ui b/data/ui/edit-fstab-dialog.ui
index 2aa1767..f27e7de 100644
--- a/data/ui/edit-fstab-dialog.ui
+++ b/data/ui/edit-fstab-dialog.ui
@@ -308,7 +308,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">If checked, additional authorization (typically requiring the user to prove he is an administrator) is required to mount the device [comment=udisks-auth]</property>
+                        <property name="tooltip_text" translatable="yes">If checked, additional authorization (typically requiring the user to prove he is an administrator) is required to mount the device [x-udisks-auth]</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -327,7 +327,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">If checked, the device is always shown in the user interface no matter what its directory is [comment=gvfs-show]</property>
+                        <property name="tooltip_text" translatable="yes">If checked, the device is always shown in the user interface no matter what its directory is [x-gvfs-show]</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -346,7 +346,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">If checked, the device is never shown in the user interface no matter what its directory is [comment=gvfs-hide]</property>
+                        <property name="tooltip_text" translatable="yes">If checked, the device is never shown in the user interface no matter what its directory is [x-gvfs-hide]</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -389,7 +389,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">If set, the name to use for the device in the user interface [comment=gvfs-name=]</property>
+                            <property name="tooltip_text" translatable="yes">If set, the name to use for the device in the user interface [x-gvfs-name=]</property>
                             <property name="hexpand">True</property>
                             <property name="invisible_char">â</property>
                             <property name="invisible_char_set">True</property>
@@ -425,7 +425,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">If set, the name of the icon to use in the device in the user interface [comment=gvfs-icon=]</property>
+                            <property name="tooltip_text" translatable="yes">If set, the name of the icon to use in the device in the user interface [x-gvfs-icon=]</property>
                             <property name="hexpand">True</property>
                             <property name="invisible_char">â</property>
                             <property name="invisible_char_set">True</property>
diff --git a/src/palimpsest/gdufstabdialog.c b/src/palimpsest/gdufstabdialog.c
index b9e1430..dcf1b1c 100644
--- a/src/palimpsest/gdufstabdialog.c
+++ b/src/palimpsest/gdufstabdialog.c
@@ -98,11 +98,11 @@ update (FstabDialogData *data,
   g_object_freeze_notify (G_OBJECT (data->options_entry));
   gdu_options_update_check_option (data->options_entry, "defaults", widget, data->defaults_checkbutton, TRUE);
   gdu_options_update_check_option (data->options_entry, "noauto", widget, data->noauto_checkbutton, FALSE);
-  gdu_options_update_check_option (data->options_entry, "comment=udisks-auth", widget, data->auth_checkbutton, FALSE);
-  gdu_options_update_check_option (data->options_entry, "comment=gvfs-show", widget, data->show_checkbutton, FALSE);
-  gdu_options_update_check_option (data->options_entry, "comment=gvfs-hide", widget, data->hide_checkbutton, FALSE);
-  gdu_options_update_entry_option (data->options_entry, "comment=gvfs-name=", widget, data->name_entry);
-  gdu_options_update_entry_option (data->options_entry, "comment=gvfs-icon=", widget, data->icon_entry);
+  gdu_options_update_check_option (data->options_entry, "x-udisks-auth", widget, data->auth_checkbutton, FALSE);
+  gdu_options_update_check_option (data->options_entry, "x-gvfs-show", widget, data->show_checkbutton, FALSE);
+  gdu_options_update_check_option (data->options_entry, "x-gvfs-hide", widget, data->hide_checkbutton, FALSE);
+  gdu_options_update_entry_option (data->options_entry, "x-gvfs-name=", widget, data->name_entry);
+  gdu_options_update_entry_option (data->options_entry, "x-gvfs-icon=", widget, data->icon_entry);
   g_object_thaw_notify (G_OBJECT (data->options_entry));
 
   can_apply = FALSE;