From 90c63ce89a23a38a5ba9990ca4b35a35244a7386 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Jun 20 2011 20:15:00 +0000
Subject: Upstream release 0.14.3


---

diff --git a/.gitignore b/.gitignore
index 4be75ff..bbc4039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gajim-0.13.4.tar.bz2
 /gajim-0.14.tar.bz2
 /gajim-0.14.1.tar.bz2
 /gajim-0.14.2.tar.bz2
+/gajim-0.14.3.tar.bz2
diff --git a/gajim-0.14-handle-read-before-close.patch b/gajim-0.14-handle-read-before-close.patch
deleted file mode 100644
index 8f340da..0000000
--- a/gajim-0.14-handle-read-before-close.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-handle read event before close event in case pipe sends us something and close pipe in the same time.
-
-fixes a regression caused by gajim-0.14-check-error.patch
-(Peter could not connect to gmail.com, reported in
- https://admin.fedoraproject.org/updates/gajim-0.14.1-2.fc14)
-
-# HG changeset patch
-# User Yann Leboulanger <asterix@lagaule.org>
-# Date 1288345298 -7200
-# Node ID 50980325f73d04f447f679834f4e88cf6806954a
-# Parent  56dcfc87d01e39cbcd30eba453e3e9d8efcaed17
-
-diff -r 56dcfc87d01e -r 50980325f73d src/common/xmpp/idlequeue.py
---- a/src/common/xmpp/idlequeue.py	Fri Oct 29 11:37:07 2010 +0200
-+++ b/src/common/xmpp/idlequeue.py	Fri Oct 29 11:41:38 2010 +0200
-@@ -388,6 +388,16 @@
-             self.unplug_idle(fd)
-             return False
- 
-+        read_write = False
-+        if flags & PENDING_READ:
-+            #print 'waiting read on %d, flags are %d' % (fd, flags)
-+            obj.pollin()
-+            read_write = True
-+
-+        elif flags & PENDING_WRITE and not flags & IS_CLOSED:
-+            obj.pollout()
-+            read_write = True
-+
-         if flags & IS_CLOSED:
-             # io error, don't expect more events
-             self.remove_timeout(obj.fd)
-@@ -395,15 +405,8 @@
-             obj.pollend()
-             return False
- 
--        if flags & PENDING_READ:
--            #print 'waiting read on %d, flags are %d' % (fd, flags)
--            obj.pollin()
-+        if read_write:
-             return True
--
--        if flags & PENDING_WRITE:
--            obj.pollout()
--            return True
--
-         return False
- 
-     def process(self):
diff --git a/gajim.spec b/gajim.spec
index 145ecf1..7285a93 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,7 +1,7 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.14
-Version:	0.14.2
+Version:	0.14.3
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
@@ -11,7 +11,6 @@ Patch0:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
 # libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
 # it's fixed.
 Patch3:		gajim-0.14-disable-libasyncns.patch
-Patch5:		gajim-0.14-handle-read-before-close.patch
 BuildArch:	noarch
 
 Requires:	avahi-ui-tools
@@ -64,7 +63,6 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 %setup -q
 %patch0 -p1
 %patch3 -p1
-%patch5 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -118,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/src
 
 %changelog
+* Mon Jun 20 2011 Michal Schmidt <mschmidt@redhat.com> 0.14.3-1
+- Upstream bugfix release.
+- gajim-0.14-handle-read-before-close.patch already applied.
+
 * Thu Jun 09 2011 Michal Schmidt <mschmidt@redhat.com> 0.14.2-1
 - Upstream bugfix release.
 - Dropped a merged patch.
diff --git a/sources b/sources
index c18e676..493e0de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03c34227174dc0db021b82cd58fb95a8  gajim-0.14.2.tar.bz2
+d8725f165884c2965aca4d6bb8502138  gajim-0.14.3.tar.bz2