[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[master 3/6] icw._doExit is now icw.close()



Because it is about to be called from other objects too.

Also there does not seem to be a need to call os._exit() since at that
point anaconda is about to terminate anyway.
---
 pyanaconda/gui.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index d3cd347..61f2d69 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -1390,7 +1390,7 @@ class InstallControlWindow:
         if ((event.keyval == gtk.keysyms.KP_Delete
              or event.keyval == gtk.keysyms.Delete)
             and (event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK))):
-            self._doExit()
+            self.close()
         # XXX hack: remove me when the accelerators work again.
         elif (event.keyval == gtk.keysyms.F12
               and self.currentWindow.getICS().getNextEnabled()):
@@ -1398,9 +1398,8 @@ class InstallControlWindow:
         elif event.keyval == gtk.keysyms.Print:
             takeScreenShot()
 
-    def _doExit (self, *args):
+    def close(self, *args):
         gtk.main_quit()
-        os._exit(0)
 
     def _doExitConfirm (self, win = None, *args):
         # FIXME: translate the string
@@ -1411,7 +1410,7 @@ class InstallControlWindow:
                             parent = win)
         if win.getrc() == 0:
             return True
-        self._doExit()
+        self.close()
 
     def createWidgets (self):
         self.window.set_title(_("%s Installer") %(productName,))
@@ -1444,7 +1443,7 @@ class InstallControlWindow:
     def connectSignals(self):
         sigs = { "on_nextButton_clicked": self.nextClicked,
             "on_rebootButton_clicked": self.nextClicked,
-            "on_closeButton_clicked": self._doExit,
+            "on_closeButton_clicked": self.close,
             "on_backButton_clicked": self.prevClicked,
             "on_debugButton_clicked": self.debugClicked,
             "on_mainWindow_key_release_event": self.keyRelease,
-- 
1.7.3.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]