[SCM] GUI front-end for Debian Live. branch, master, updated. f76efbf8de703844fad3759d2d8a54f128a3a322

[Chris Lamb]

The following commit has been merged in the master branch:
commit f76efbf8de703844fad3759d2d8a54f128a3a322
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jul 8 20:46:36 2008 +0100

    Don't segfault when DISPLAY is not set. Thanks to W. Martin Borgert.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/__init__.py b/LiveMagic/__init__.py
index 0c88e40..2e9ad90 100644
--- a/LiveMagic/__init__.py
+++ b/LiveMagic/__init__.py
@@ -10,6 +10,11 @@ from LiveMagic import views, controllers
 class LiveMagic(object):
 
     def __init__(self, args):
+        try:
+            gtk.init_check()
+        except RuntimeError, e:
+            sys.exit('E: %s. Exiting.' % e)
+
         c = controllers.Controller(sys.argv[1:])
         v = views.View(c)
 
diff --git a/debian/changelog b/debian/changelog
index 2c6f17c..b2fcfcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ live-magic (0.4) UNRELEASED; urgency=low
   * Move to GPL v3.
   * Use LIVE_ not LH_ (Closes: #443124)
   * Add Depends: on gksu (Closes: #476071)
+  * Don't segfault when DISPLAY is not set. Thanks to W. Martin Borgert
+    (debacle at debian.org>) for the patch. (Closes: #489904)
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Mon, 14 Jan 2008 18:36:43 +0000
 

-- 
GUI front-end for Debian Live.