rpms/pyspi/devel x11-exception.patch,NONE,1.1 pyspi.spec,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: zcerza

Update of /cvs/dist/rpms/pyspi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25724

Modified Files:
	pyspi.spec 
Added Files:
	x11-exception.patch 
Log Message:
Add x11-exception.patch to fix bug #208861.


x11-exception.patch:
 pyspi.pyx |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE x11-exception.patch ---
===================================================================
RCS file: /cvs/gnome/pyspi/pyspi.pyx,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** pyspi.pyx	2006/08/18 14:20:09	1.21
--- pyspi.pyx	2006/10/02 17:28:41	1.22
***************
*** 78,83 ****
--- 78,92 ----
  	cspi.SPI_freeString(string)
  	return pyString
  
+ import os
+ class X11Exception(Exception):
+ 	def __init__(self, display = os.environ.get('DISPLAY', None)):
+ 		self.display = display
+ 	def __str__(self):
+ 		msg = "Cannot open display"
+ 		if self.display: return msg + ': ' + self.display
+ 		else: return msg
+ 
  class AtspiException(Exception):
  	"""
  	Exceptions raised when calls to the AT-SPI C bindings return FALSE to
***************
*** 151,156 ****
--- 160,172 ----
  
  cdef class Registry:
  	def __init__ (self):
+ 		cdef Xlib.Display *display
+ 		display = Xlib.XOpenDisplay(NULL)
+ 		if display == NULL:
+ 			raise X11Exception
+ 		else:
+ 			Xlib.XCloseDisplay(display)
+ 
  		result = cspi.SPI_init ()
  		#if result!=0:
  		#	raise AtspiException("SPI_init: exit code %s" % str(result))


Index: pyspi.spec
===================================================================
RCS file: /cvs/dist/rpms/pyspi/devel/pyspi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyspi.spec	13 Sep 2006 21:35:02 -0000	1.2
+++ pyspi.spec	2 Oct 2006 17:48:30 -0000	1.3
@@ -8,6 +8,7 @@
 Source0: http://people.redhat.com/zcerza/dogtail/releases/pyspi-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: at-spi-devel, Pyrex, libX11-devel
+patch0: x11-exception.patch
 
 %description
 AT-SPI allows assistive technologies to access GTK-based applications.  It
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 python ./setup.py build
@@ -37,6 +39,9 @@
 %doc ChangeLog
 
 %changelog
+* Mon Oct 02 2006 Zack Cerza <zcerza at redhat.com> - 0.6.0-2
+- Add x11-exception.patch to fix bug #208861.
+
 * Wed Sep 13 2006 Zack Cerza <zcerza at redhat.com> - 0.6.0-1
 - New upstream release.
 - Add libX11-devel to BuildRequires.