[PATCH 1/2] Destroy the modify volume group dialog on escape, too (#965755).

Chris Lumens clumens at redhat.com
Fri May 24 14:36:49 UTC 2013


---
 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 8bf1a74..0212ac4 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -346,7 +346,6 @@ use.  Try something else?</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_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 5d318a6..d457f7b 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -446,9 +446,6 @@ class ContainerDialog(GUIObject):
             fancy_set_sensitive(self.sizeCombo, False)
             self.sizeEntry.set_sensitive(False)
 
-    def on_cancel_clicked(self, button):
-        self.window.destroy()
-
     def _get_disk_by_id(self, disk_id):
         for disk in self._disks:
             if disk.id == disk_id:
@@ -2229,6 +2226,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         with enlightbox(self.window, dialog.window):
             rc = dialog.run()
+            dialog.window.destroy()
 
         if rc == 0:
             return
-- 
1.8.1.2



More information about the anaconda-patches mailing list