diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2006-05-21 19:04:20 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2006-05-21 19:04:20 +0000 |
| commit | 4e801d79e363bee21034d166d85232e8e070cc5e (patch) | |
| tree | 0e3e80cea95a51f70a28560ebf1ba542d07e6aca /net-im/gajim | |
| parent | - Update to 1.3. (diff) | |
fix file-transfer connection problems, patch by Dimitur Kirov
PR: 97358
Submitted by: Stephan Maka <stephan@spaceboyz.net>
Notes
Notes:
svn path=/head/; revision=162964
Diffstat (limited to 'net-im/gajim')
| -rw-r--r-- | net-im/gajim/Makefile | 3 | ||||
| -rw-r--r-- | net-im/gajim/files/patch-Changeset6314 | 39 |
2 files changed, 42 insertions, 0 deletions
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile index 8a2710437dde..9c7bbe459c5b 100644 --- a/net-im/gajim/Makefile +++ b/net-im/gajim/Makefile @@ -7,6 +7,7 @@ PORTNAME= gajim PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.gajim.org/downloads/ @@ -16,6 +17,8 @@ COMMENT= Gajim is a Jabber client based on a plugin system LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21 +PATCH_DIST_STRIP=-p1 + USE_X_PREFIX= yes USE_PYTHON= 2.3+ USE_GMAKE= yes diff --git a/net-im/gajim/files/patch-Changeset6314 b/net-im/gajim/files/patch-Changeset6314 new file mode 100644 index 000000000000..c828e687ffcc --- /dev/null +++ b/net-im/gajim/files/patch-Changeset6314 @@ -0,0 +1,39 @@ +diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py +--- src/common/proxy65_manager.py Mon May 1 18:49:14 2006 ++++ src/common/proxy65_manager.py Tue May 16 19:55:10 2006 +@@ -15,6 +15,7 @@ + ## + import socket + import struct ++import errno + + import common.xmpp + from common import gajim +@@ -246,16 +247,18 @@ + self._recv=self._sock.recv + except Exception, ee: + (errnum, errstr) = ee +- if errnum == 111: +- self.on_failure() +- return None ++ if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): ++ # still trying to connect ++ return + # win32 needs this +- elif errnum != 10056 or self.state != 0: +- return None +- else: # socket is already connected +- self._sock.setblocking(False) +- self._send=self._sock.send +- self._recv=self._sock.recv ++ if errnum not in (0, 10056, errno.EISCONN): ++ # connection failed ++ self.on_failure() ++ return ++ # socket is already connected ++ self._sock.setblocking(False) ++ self._send=self._sock.send ++ self._recv=self._sock.recv + self.buff = '' + self.state = 1 # connected + self.idlequeue.plug_idle(self, True, False) |