[gnome-disk-utility/udisks2-port] Never pass a blank options string when creating/updating fstab entries

[David Zeuthen <davidz src gnome org>]

commit 8b063e8c4767ee67dcd3ce6cad95aea1e247be1c
Author: David Zeuthen <davidz redhat com>
Date:   Thu Jan 19 13:36:54 2012 -0500

    Never pass a blank options string when creating/updating fstab entries
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/palimpsest/gdufstabdialog.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/palimpsest/gdufstabdialog.c b/src/palimpsest/gdufstabdialog.c
index 7ea365d..266144a 100644
--- a/src/palimpsest/gdufstabdialog.c
+++ b/src/palimpsest/gdufstabdialog.c
@@ -431,6 +431,8 @@ gdu_fstab_dialog_show (GduWindow    *window,
       g_variant_lookup (data.orig_fstab_entry, "dir", "^&ay", &dir);
       g_variant_lookup (data.orig_fstab_entry, "type", "^&ay", &type);
       g_variant_lookup (data.orig_fstab_entry, "opts", "^&ay", &opts);
+      if (g_strcmp0 (opts, "defaults") == 0)
+        opts = "";
       g_variant_lookup (data.orig_fstab_entry, "freq", "i", &freq);
       g_variant_lookup (data.orig_fstab_entry, "passno", "i", &passno);
     }
@@ -542,7 +544,10 @@ gdu_fstab_dialog_show (GduWindow    *window,
           g_variant_builder_add (&builder, "{sv}", "fsname", g_variant_new_bytestring (ui_fsname));
           g_variant_builder_add (&builder, "{sv}", "dir", g_variant_new_bytestring (ui_dir));
           g_variant_builder_add (&builder, "{sv}", "type", g_variant_new_bytestring (ui_type));
-          g_variant_builder_add (&builder, "{sv}", "opts", g_variant_new_bytestring (ui_opts));
+          if (strlen (ui_opts) > 0)
+            g_variant_builder_add (&builder, "{sv}", "opts", g_variant_new_bytestring (ui_opts));
+          else
+            g_variant_builder_add (&builder, "{sv}", "opts", g_variant_new_bytestring ("defaults"));
           g_variant_builder_add (&builder, "{sv}", "freq", g_variant_new_int32 (freq));
           g_variant_builder_add (&builder, "{sv}", "passno", g_variant_new_int32 (passno));
           new_item = g_variant_new ("(sa{sv})", "fstab", &builder);