[PATCH] Destroy the Add Mountpoint dialog when escape is pressed (#853058).
Chris Lumens
clumens at redhat.com
Fri Aug 31 15:14:08 UTC 2012
---
pyanaconda/ui/gui/spokes/custom.glade | 1 -
pyanaconda/ui/gui/spokes/custom.py | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index a2e2b64..1a0bf8d 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -36,7 +36,6 @@
<property name="halign">end</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_add_cancel_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index f0e8d58..5de6c35 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -132,9 +132,6 @@ class AddDialog(GUIObject):
completion.set_text_column(0)
completion.set_popup_completion(True)
- def on_add_cancel_clicked(self, button, *args):
- self.window.destroy()
-
def on_add_confirm_clicked(self, button, *args):
self.mountpoint = self.builder.get_object("addMountPointEntry").get_text()
@@ -948,6 +945,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
if rc != 1:
# user cancel
+ dialog.window.destroy()
return
# create a device of the default type, using any disks, with an
--
1.7.11.2
More information about the anaconda-patches
mailing list