GNOME.org
 

[gnome-disk-utility/udisks2-port] Hook up fstab 'comment=udisks-auth' and crypttab 'x-udisks-auth' options

commit aca0458b2b8883c3d96356f3bdbea08a442ceeee
Author: David Zeuthen <davidz redhat com>
Date:   Thu Jan 19 10:32:18 2012 -0500

    Hook up fstab 'comment=udisks-auth' and crypttab 'x-udisks-auth' options
    
    Also nuke the 'users' option since this is no longer very
    relevant. Screenshots
    
     http://people.freedesktop.org/~david/udisks-fstab-option-udisks-auth.png
     http://people.freedesktop.org/~david/udisks-crypttab-option-x-udisks-auth.png
    
    See udisks commit 05527d63cae66c86bf1d456b9efa6d95a49bae53 for the
    whole story.
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 data/ui/edit-crypttab-dialog.ui    |   29 ++++++++++++++++++++++++-----
 data/ui/edit-fstab-dialog.ui       |   10 +++++-----
 src/palimpsest/gducrypttabdialog.c |    5 +++++
 src/palimpsest/gdufstabdialog.c    |    8 ++++----
 4 files changed, 38 insertions(+), 14 deletions(-)
---
diff --git a/data/ui/edit-crypttab-dialog.ui b/data/ui/edit-crypttab-dialog.ui
index b99bdeb..fef1bd0 100644
--- a/data/ui/edit-crypttab-dialog.ui
+++ b/data/ui/edit-crypttab-dialog.ui
@@ -194,7 +194,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -209,7 +209,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -227,7 +227,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -245,7 +245,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">4</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -263,7 +263,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">4</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -288,6 +288,25 @@
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkCheckButton" id="crypttab-auth-checkbutton">
+                        <property name="label" translatable="yes">Require additional authorizations to unlock</property>
+                        <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 authorizations (typically requiring the user to prove he is an administrator) are required to unlock the device [x-udisks-no-auth]</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
                       <placeholder/>
                     </child>
                     <child>
diff --git a/data/ui/edit-fstab-dialog.ui b/data/ui/edit-fstab-dialog.ui
index cc722d3..f270205 100644
--- a/data/ui/edit-fstab-dialog.ui
+++ b/data/ui/edit-fstab-dialog.ui
@@ -283,12 +283,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="fstab-users-checkbutton">
-                        <property name="label" translatable="yes">Allow any _user to mount and unmount</property>
+                      <object class="GtkCheckButton" id="fstab-auth-checkbutton">
+                        <property name="label" translatable="yes">Require additional authorizations to mount</property>
                         <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, any user may mount and unmount the device [users]</property>
+                        <property name="tooltip_text" translatable="yes">If checked, additional authorizations (typically requiring the user to prove he is an administrator) are required to mount the device [comment=udisks-no-auth]</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -303,7 +303,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fstab-show-checkbutton">
-                        <property name="label" translatable="yes">Always sho_w in user interface</property>
+                        <property name="label" translatable="yes">Always show in user interface</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -322,7 +322,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fstab-hide-checkbutton">
-                        <property name="label" translatable="yes">Never sh_ow in user interface</property>
+                        <property name="label" translatable="yes">Never show in user interface</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/src/palimpsest/gducrypttabdialog.c b/src/palimpsest/gducrypttabdialog.c
index 60a8602..559c76e 100644
--- a/src/palimpsest/gducrypttabdialog.c
+++ b/src/palimpsest/gducrypttabdialog.c
@@ -51,6 +51,7 @@ typedef struct
   GtkWidget *name_entry;
   GtkWidget *options_entry;
   GtkWidget *noauto_checkbutton;
+  GtkWidget *auth_checkbutton;
   GtkWidget *passphrase_label;
   GtkWidget *passphrase_entry;
   GtkWidget *show_passphrase_checkbutton;
@@ -155,6 +156,7 @@ update (CrypttabDialogData *data,
 
   g_object_freeze_notify (G_OBJECT (data->options_entry));
   gdu_options_update_check_option (data->options_entry, "noauto", widget, data->noauto_checkbutton);
+  gdu_options_update_check_option (data->options_entry, "x-udisks-auth", widget, data->auth_checkbutton);
   g_object_thaw_notify (G_OBJECT (data->options_entry));
 
   can_apply = FALSE;
@@ -239,6 +241,8 @@ crypttab_dialog_present (CrypttabDialogData *data)
                     "notify::text", G_CALLBACK (on_property_changed), data);
   g_signal_connect (data->noauto_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), data);
+  g_signal_connect (data->auth_checkbutton,
+                    "notify::active", G_CALLBACK (on_property_changed), data);
   g_signal_connect (data->passphrase_entry,
                     "notify::text", G_CALLBACK (on_property_changed), data);
 
@@ -480,6 +484,7 @@ gdu_crypttab_dialog_show (GduWindow    *window,
   data->name_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-name-entry"));
   data->options_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-options-entry"));
   data->noauto_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-noauto-checkbutton"));
+  data->auth_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-auth-checkbutton"));
   data->passphrase_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-label"));
   data->passphrase_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-entry"));
   data->show_passphrase_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-show-passphrase-checkbutton"));
diff --git a/src/palimpsest/gdufstabdialog.c b/src/palimpsest/gdufstabdialog.c
index 35de2da..7ea365d 100644
--- a/src/palimpsest/gdufstabdialog.c
+++ b/src/palimpsest/gdufstabdialog.c
@@ -46,7 +46,7 @@ typedef struct
 
   GtkWidget *options_entry;
   GtkWidget *noauto_checkbutton;
-  GtkWidget *users_checkbutton;
+  GtkWidget *auth_checkbutton;
   GtkWidget *show_checkbutton;
   GtkWidget *hide_checkbutton;
   GtkWidget *name_entry;
@@ -96,7 +96,7 @@ update (FstabDialogData *data,
 
   g_object_freeze_notify (G_OBJECT (data->options_entry));
   gdu_options_update_check_option (data->options_entry, "noauto", widget, data->noauto_checkbutton);
-  gdu_options_update_check_option (data->options_entry, "users", widget, data->users_checkbutton);
+  gdu_options_update_check_option (data->options_entry, "comment=udisks-auth", widget, data->auth_checkbutton);
   gdu_options_update_check_option (data->options_entry, "comment=gvfs-show", widget, data->show_checkbutton);
   gdu_options_update_check_option (data->options_entry, "comment=gvfs-hide", widget, data->hide_checkbutton);
   gdu_options_update_entry_option (data->options_entry, "comment=gvfs-name=", widget, data->name_entry);
@@ -404,7 +404,7 @@ gdu_fstab_dialog_show (GduWindow    *window,
   data.type_entry = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-type-entry"));
   data.options_entry = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-options-entry"));
   data.noauto_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-noauto-checkbutton"));
-  data.users_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-users-checkbutton"));
+  data.auth_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-auth-checkbutton"));
   data.show_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-show-checkbutton"));
   data.hide_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-hide-checkbutton"));
   data.name_entry = GTK_WIDGET (gtk_builder_get_object (builder, "fstab-name-entry"));
@@ -489,7 +489,7 @@ gdu_fstab_dialog_show (GduWindow    *window,
                     "changed", G_CALLBACK (fstab_on_device_combobox_changed), &data);
   g_signal_connect (data.noauto_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), &data);
-  g_signal_connect (data.users_checkbutton,
+  g_signal_connect (data.auth_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), &data);
   g_signal_connect (data.show_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), &data);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]