[gnome-disk-utility/new-ui] Don't offer to create an extended partition when formatting a volume

[David Zeuthen <davidz src gnome org>]

commit 6de1cf62a16f7ad9b73feadb8ca8038544626bb0
Author: David Zeuthen <davidz redhat com>
Date:   Sat Oct 3 16:33:18 2009 -0400

    Don't offer to create an extended partition when formatting a volume
    
    Also, don't show the take_ownership check button when "Empty" is
    selected.

 src/gdu-gtk/gdu-format-dialog.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/gdu-gtk/gdu-format-dialog.c b/src/gdu-gtk/gdu-format-dialog.c
index 69c21b7..3c31925 100644
--- a/src/gdu-gtk/gdu-format-dialog.c
+++ b/src/gdu-gtk/gdu-format-dialog.c
@@ -355,6 +355,9 @@ update (GduFormatDialog *dialog)
                                 dialog->priv->take_ownership = FALSE;
                         }
                 }
+        } else {
+                gtk_widget_hide (dialog->priv->take_ownership_check_button);
+                dialog->priv->take_ownership = FALSE;
         }
         gtk_entry_set_max_length (GTK_ENTRY (dialog->priv->fs_label_entry), max_label_len);
         if (max_label_len == 0) {
@@ -365,8 +368,7 @@ update (GduFormatDialog *dialog)
         }
 
         if (! (dialog->priv->flags & GDU_FORMAT_DIALOG_FLAGS_SIMPLE)) {
-                if (g_strcmp0 (dialog->priv->fs_type, "empty") == 0 ||
-                    g_strcmp0 (dialog->priv->fs_type, "msdos_extended_partition") == 0) {
+                if (g_strcmp0 (dialog->priv->fs_type, "empty") == 0) {
                         gtk_widget_hide (dialog->priv->encrypt_check_button);
                         dialog->priv->encrypt = FALSE;
                 } else {
@@ -529,7 +531,7 @@ gdu_format_dialog_constructed (GObject *object)
                 dialog->priv->encrypt = FALSE;
                 dialog->priv->take_ownership = FALSE;
         } else {
-                combo_box = gdu_util_fstype_combo_box_create (gdu_dialog_get_pool (GDU_DIALOG (dialog)), "mbr");
+                combo_box = gdu_util_fstype_combo_box_create (gdu_dialog_get_pool (GDU_DIALOG (dialog)), NULL);
                 gdu_util_fstype_combo_box_select (combo_box, "ext4");
                 dialog->priv->fs_type = g_strdup ("ext4");
                 dialog->priv->fs_options = NULL;