[Miro] Catch exception when started without a valid DISPLAY (# 633999)

[Michel Alexandre Salim]

commit d360bdc20b7e0f13189c42fc399f2d49e9858807
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Sep 20 08:22:37 2010 +0200

    Catch exception when started without a valid DISPLAY (# 633999)

 Miro.spec                     |    8 +++++++-
 miro-3.0.3-checkdisplay.patch |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/Miro.spec b/Miro.spec
index d32ca00..b289aaa 100644
--- a/Miro.spec
+++ b/Miro.spec
@@ -3,7 +3,7 @@
 
 Name:           Miro
 Version:        3.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Internet TV Player
 
 Group:          Applications/Multimedia
@@ -12,6 +12,8 @@ URL:            http://www.getmiro.com/
 Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
 # http://bugzilla.pculture.org/show_bug.cgi?id=13312
 Patch0:         %{name}-2.0-videodir.patch
+# http://bugzilla.pculture.org/show_bug.cgi?id=14610
+Patch1:         miro-3.0.3-checkdisplay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel Pyrex gtk2-devel pygtk2-devel
@@ -42,6 +44,7 @@ their shows with them.
 # Otherwise, the unpatched files get re-added into Miro
 # (and '.' breaks Python imports)
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -98,6 +101,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Sep 20 2010 Michel Salim <salimma at fedoraproject.org> - 3.0.3-2
+- Catch exception when started without a valid DISPLAY (# 633999)
+
 * Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.0.3-1
 - Update to upstream 3.0.3.  Potentially fixes a whole slew of bugs
   including YouTube downloads not working
diff --git a/miro-3.0.3-checkdisplay.patch b/miro-3.0.3-checkdisplay.patch
new file mode 100644
index 0000000..30fa5e8
--- /dev/null
+++ b/miro-3.0.3-checkdisplay.patch
@@ -0,0 +1,16 @@
+--- miro-3.0.3/platform/gtk-x11/plat/frontends/widgets/application.py.checkdisplay	2010-07-26 16:14:12.000000000 +0200
++++ miro-3.0.3/platform/gtk-x11/plat/frontends/widgets/application.py	2010-09-20 07:39:21.138442297 +0200
+@@ -26,7 +26,12 @@
+ # this exception statement from your version. If you delete this exception
+ # statement from all source files in the program, then also delete it here.
+ 
+-import gtk
++try:
++    import gtk
++except RuntimeError:
++    print "You do not appear to have a working display."
++    import sys
++    sys.exit(1)
+ import gobject
+ import os
+ import gconf