From f5297182b3febc9f5a2ed4f333eeb11849570b86 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 6 Feb 2008 23:28:35 -0500 Subject: Cancel on escape being pressed --- iw/autopart_type.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index a75b888e1..81393cd9b 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -81,7 +81,7 @@ def whichToResize(partitions, diskset, intf): math.floor(req.size)), req) if req.targetSize is not None: - combo.set_active(i) + combo.set_active_iter(i) found = True if biggest < 0 or req.size > getActive(combo).size: biggest = i @@ -100,7 +100,7 @@ def whichToResize(partitions, diskset, intf): gui.addFrame(dialog) dialog.show_all() rc = dialog.run() - if rc == gtk.RESPONSE_CANCEL: + if rc != gtk.RESPONSE_OK: dialog.destroy() return rc @@ -129,7 +129,7 @@ class PartitionTypeWindow(InstallWindow): else: if val == -2: rc = whichToResize(self.partitions, self.diskset, self.intf) - if rc == gtk.RESPONSE_CANCEL: + if rc != gtk.RESPONSE_OK: raise gui.StayOnScreen # we're not going to delete any partitions in the resize case -- cgit