rpms/istanbul/F-12 istanbul-save_window.patch, NONE, 1.1 istanbul.spec, 1.20, 1.21

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/istanbul/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16434

Modified Files:
	istanbul.spec 
Added Files:
	istanbul-save_window.patch 
Log Message:
* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
* Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
- Patch for exception handling to prevent crash, bug 541003


istanbul-save_window.patch:
 istanbul-save_window.patch |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE istanbul-save_window.patch ---
--- ./istanbul/main/save_window.py	2009-12-18 12:20:38.027242576 -0500
+++ ./istanbul-save_window.patch	2009-12-18 13:12:13.024243540 -0500
@@ -35,8 +35,13 @@ class VideoWidget(gtk.DrawingArea):
     def __init__(self):
         gtk.DrawingArea.__init__(self)
         self.imagesink = None
+        self._xid = None
         self.unset_flags(gtk.DOUBLE_BUFFERED)
 
+    def do_realize(self):
+        Gtk.DrawingArea.do_realize(self)
+        self._xid = self.window.xid
+
     def do_expose_event(self, event):
         if self.imagesink:
             self.imagesink.expose()
@@ -45,9 +50,9 @@ class VideoWidget(gtk.DrawingArea):
             return True
 
     def set_sink(self, sink):
-        assert self.window.xid
+        assert self._xid is not None
         self.imagesink = sink
-        self.imagesink.set_xwindow_id(self.window.xid)
+        self.imagesink.set_xwindow_id(self._xid)
 
 class SaveWindow(gtk.Window):
     UPDATE_INTERVAL = 500



Index: istanbul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/istanbul/F-12/istanbul.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- istanbul.spec	26 Nov 2009 07:21:32 -0000	1.20
+++ istanbul.spec	23 Dec 2009 22:44:30 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -15,6 +15,7 @@ Source: http://zaheer.merali.org/istanbu
 Patch0: istanbul-configure.patch
 Patch1: istanbul-screencast.patch
 Patch2: istanbul-URI_exception.patch
+Patch3: istanbul-save_window.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= %{pygtk2_version}
@@ -54,6 +55,7 @@ playback.
 %setup -q
 %patch0
 %patch1
+%patch3
 %build
 #aclocal
 #automake
@@ -115,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{python_sitelib}/%{name}/extern/pytrayicon/*.so*
 
 %changelog
+* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
+- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
 * Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
 - Patch for exception handling to prevent crash, bug 541003