[Fwd: Re: Gajim 0.13.4-4]

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

"Yann Leboulanger" <asterix@lagaule.org> wrote, Sun, 18 Sep 2011 19:32:50 +0200
> On 09/18/2011 05:47 PM, Adam D. Barratt wrote:
> > Please could you provide a debdiff against the current stable package
> > (i.e. "debdiff $stable.dsc $new.dsc") for a final check?
>
> Sure. It's attached

Thanks.

I'd generally prefer 0.13.4-3+squeeze1 as a version number, but please
go ahead.

Regards,

Adam

diff -u gajim-0.13.4/debian/changelog gajim-0.13.4/debian/changelog
--- gajim-0.13.4/debian/changelog
+++ gajim-0.13.4/debian/changelog
@@ -1,3 +1,10 @@
+gajim (0.13.4-4) stable; urgency=low
+
+  [ Étienne Loks ]
+  * Fix CPU high load when connecting first. Closes: #634880
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Thu, 21 Jul 2011 21:15:34 +0100
+
 gajim (0.13.4-3) unstable; urgency=low
 
   * Fix a problem when canceling password keyring creation.
only in patch2:
unchanged:
--- gajim-0.13.4.orig/debian/patches/01_cpu_load.patch
+++ gajim-0.13.4/debian/patches/01_cpu_load.patch
@@ -0,0 +1,34 @@
+Index: src/common/xmpp/idlequeue.py
+===================================================================
+--- src/common/xmpp/idlequeue.py Sun Sep 18 12:54:42 2011 +0200
++++ src/common/xmpp/idlequeue.py Sun Sep 18 12:54:42 2011 +0200
+@@ -362,20 +362,25 @@
+ 			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()
+-			return True
++			read_write = True
+ 
+-		elif flags & PENDING_WRITE:
++		elif flags & PENDING_WRITE and not flags & IS_CLOSED:
+ 			obj.pollout()
+-			return True
++			read_write = True
+ 
+-		elif flags & IS_CLOSED:
++		if flags & IS_CLOSED:
+ 			# io error, don't expect more events
+ 			self.remove_timeout(obj.fd)
+ 			self.unplug_idle(obj.fd)
+ 			obj.pollend()
++			return False
++
++		if read_write:
++			return True
+ 		return False
+ 
+ 	def process(self):