[SCM] GUI front-end for Debian Live. branch, master, updated. f258fc784ecaebf66921d8ec77d7bc46a74e9506
Chris Lamb
chris at chris-lamb.co.uk
Thu Jul 10 23:52:34 UTC 2008
The following commit has been merged in the master branch:
commit 5cebac9841da847317908edce72ac98d25e02bb2
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Jul 10 21:37:56 2008 +0100
Fix some SEGV bugs by ensuring main_quit is closed in the GTK loop thread.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index af2e0f8..7f15764 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -3,6 +3,7 @@ import gtk
import time
import popen2
import shutil
+import gobject
import threading
import subprocess
@@ -52,7 +53,7 @@ class WizardController(object):
try:
# If build-log.txt exists, we had a successful build
os.stat(os.path.join(self.model.dir, 'build-log.txt'))
- gtk.main_quit()
+ gobject.timeout_add(0, lambda: gtk.main_quit())
return
except:
pass
diff --git a/LiveMagic/views/build.py b/LiveMagic/views/build.py
index 652740f..95d535f 100644
--- a/LiveMagic/views/build.py
+++ b/LiveMagic/views/build.py
@@ -1,5 +1,6 @@
import vte
import gtk
+import gobject
class BuildView(object):
def __init__(self):
@@ -24,7 +25,7 @@ class BuildView(object):
def do_hide_window_build(self):
self['window_build'].hide()
- self.build_close_callback()
+ gobject.timeout_add(0, self.build_close_callback)
def set_build_titles(self, heading, subheading):
self['window_build'].set_title(heading)
--
GUI front-end for Debian Live.
More information about the debian-live-changes
mailing list