Remove disabled badblocks checking code.

4 files changed, 12 insertions, 53 deletions

diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index dc5fdd195..ae9c614a5 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -3,7 +3,7 @@
 #
 # Michael Fulbright <msf@redhat.com>
 #
-# Copyright 2002 Red Hat, Inc.
+# Copyright 2002-2007 Red Hat, Inc.
 #
 # This software may be freely redistributed under the terms of the GNU
 # library public license.
@@ -463,7 +463,7 @@ class VolumeGroupEditor:
 
 	self.fsoptionsDict = {}
 	if logrequest.getPreExisting():
-	    (row, self.fsoptionsDict) = createPreExistFSOptionSection(logrequest, maintable, row, mountCombo, showbadblocks=0, ignorefs = ["software RAID", "physical volume (LVM)", "vfat"])
+	    (row, self.fsoptionsDict) = createPreExistFSOptionSection(logrequest, maintable, row, mountCombo, ignorefs = ["software RAID", "physical volume (LVM)", "vfat"])
 
         dialog.vbox.pack_start(maintable)
         dialog.show_all()
@@ -622,7 +622,6 @@ class VolumeGroupEditor:
 	    request.size = size
             request.format = format
             request.migrate = migrate
-	    request.badblock = None
             request.grow = 0
 
 	    # this is needed to clear out any cached info about the device
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index 30309d2b6..042be1771 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -3,7 +3,7 @@
 #
 # Michael Fulbright <msf@redhat.com>
 #
-# Copyright 2001-2002 Red Hat, Inc.
+# Copyright 2001-2007 Red Hat, Inc.
 #
 # This software may be freely redistributed under the terms of the GNU
 # library public license.
@@ -117,22 +117,17 @@ class PartitionEditor:
                 request = copy.copy(self.origrequest)
                 request.fstype = filesystem
                 request.format = True
-                
+
                 if request.fstype.isMountable():
                     request.mountpoint = self.mountCombo.get_children()[0].get_text()
                 else:
                     request.mountpoint = None
-                    
+
                 if self.primonlycheckbutton.get_active():
                     primonly = True
                 else:
                     primonly = None
 
-                if self.badblocks and self.badblocks.get_active():
-                    request.badblocks = True
-                else:
-                    request.badblocks = None
-
                 if not self.newbycyl:
                     if self.fixedrb.get_active():
                         grow = None
@@ -204,13 +199,8 @@ class PartitionEditor:
                     request.format = formatrb.get_active()
                     if request.format:
                         request.fstype = self.fsoptionsDict["fstypeCombo"].get_active_value()
-                    if self.fsoptionsDict.has_key("badblocks") and self.fsoptionsDict["badblocks"].get_active():
-                        request.badblocks = True
-                    else:
-                        request.badblocks = None
                 else:
                     request.format = 0
-                    request.badblocks = None
 
 		if self.fsoptionsDict.has_key("migraterb"):
 		    migraterb = self.fsoptionsDict["migraterb"]
@@ -471,17 +461,6 @@ class PartitionEditor:
                 maintable.attach(self.primonlycheckbutton, 0, 2, row, row+1)
                 row = row + 1
 
-	    # disable option for badblocks checking
-	    self.badblocks = None
-
-	    # uncomment to reenable
-            #self.badblocks = gtk.CheckButton(_("Check for _bad blocks"))
-            #self.badblocks.set_active(0)
-            #maintable.attach(self.badblocks, 0, 1, row, row + 1)
-            #row = row + 1
-            #if self.origrequest.badblocks:
-            #    self.badblocks.set_active(1)
-            
         # put main table into dialog
         self.dialog.vbox.pack_start(maintable)
         self.dialog.show_all()
diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
index ae9a1a23a..958ff056c 100644
--- a/iw/partition_ui_helpers_gui.py
+++ b/iw/partition_ui_helpers_gui.py
@@ -4,7 +4,7 @@
 #
 # Michael Fulbright <msf@redhat.com>
 #
-# Copyright 2001-2002 Red Hat, Inc.
+# Copyright 2001-2007 Red Hat, Inc.
 #
 # This software may be freely redistributed under the terms of the GNU
 # library public license.
@@ -219,10 +219,7 @@ def formatOptionCB(widget, data):
     else:
 	setMntPtComboStateFromType(ofstype, mntptcombo)
 
-def noformatCB(widget, badblocks):
-    badblocks.set_sensitive(widget.get_active())
-
-def noformatCB2(widget, data):
+def noformatCB(widget, data):
     (combowidget, mntptcombo, ofstype) = data
     combowidget.set_sensitive(not widget.get_active())
 
@@ -243,10 +240,9 @@ def noformatCB2(widget, data):
        migraterb     - radiobutton for migrate fs
        migfstype     - menu for migrate fs types
        migfstypeMenu - menu for migrate fs types
-       badblocks     - toggle button for badblock check
 """
 def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo,
-                                  showbadblocks=0, ignorefs=[]):
+                                  ignorefs=[]):
     ofstype = origrequest.fstype
 
     maintable.attach(gtk.HSeparator(), 0, 2, row, row + 1)
@@ -285,7 +281,7 @@ def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo,
     formatrb.connect("toggled", formatOptionCB,
 		     (fstypeCombo, mountCombo, ofstype))
 
-    noformatrb.connect("toggled", noformatCB2,
+    noformatrb.connect("toggled", noformatCB,
 		     (fstypeCombo, mountCombo, origrequest.origfstype))
 
     if origrequest.origfstype.isMigratable():
@@ -310,25 +306,11 @@ def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo,
 	migraterb = None
 	migfstypeCombo = None
 
-    if showbadblocks:
-        badblocks = gtk.CheckButton(_("Check for _bad blocks?"))
-        badblocks.set_active(0)
-        maintable.attach(badblocks, 0, 1, row, row + 1)
-        formatrb.connect("toggled", noformatCB, badblocks)
-        if not origrequest.format:
-            badblocks.set_sensitive(0)
-
-        if origrequest.badblocks:
-            badblocks.set_active(1)
-
-    else:
-        badblocks = None
-        
     row = row + 1
 
     rc = {}
     for var in ['noformatrb', 'formatrb', 'fstypeCombo',
-                'migraterb', 'migfstypeCombo', 'badblocks' ]:
+                'migraterb', 'migfstypeCombo']:
         if eval("%s" % (var,)) is not None:
             rc[var] = eval("%s" % (var,))
 
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index b9b7f0ac1..69e1cf672 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -4,7 +4,7 @@
 # Michael Fulbright <msf@redhat.com>
 # Jeremy Katz <katzj@redhat.com>
 #
-# Copyright 2001-2004 Red Hat, Inc.
+# Copyright 2001-2007 Red Hat, Inc.
 #
 # This software may be freely redistributed under the terms of the GNU
 # library public license.
@@ -127,7 +127,6 @@ class RaidEditor:
 	    request = copy.copy(self.origrequest)
 
 	    # doesn't make sense for RAID device
-	    request.badblocks = None
             if not self.origrequest.getPreExisting():
                 filesystem = self.fstypeCombo.get_active_value()
                 request.fstype = filesystem
@@ -411,7 +410,7 @@ class RaidEditor:
                 maintable.attach(self.formatButton, 0, 2, row, row + 1)
                 row = row + 1
 	else:
-	    (row, self.fsoptionsDict) = createPreExistFSOptionSection(self.origrequest, maintable, row, self.mountCombo, showbadblocks=0)
+	    (row, self.fsoptionsDict) = createPreExistFSOptionSection(self.origrequest, maintable, row, self.mountCombo)
 
 	# put main table into dialog
 	dialog.vbox.pack_start(maintable)