View | Details | Raw Unified | Return to bug 98770
Collapse All | Expand All

(-)net-im/gajim/Makefile (-4 / +1 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	gajim
8
PORTNAME=	gajim
9
PORTVERSION=	0.10
9
PORTVERSION=	0.10.1
10
PORTREVISION=	1
11
CATEGORIES=	net-im
10
CATEGORIES=	net-im
12
MASTER_SITES=	http://www.gajim.org/downloads/
11
MASTER_SITES=	http://www.gajim.org/downloads/
13
12
Lines 16-23 Link Here
16
15
17
LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
16
LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
18
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
17
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
19
20
PATCH_DIST_STRIP=-p1
21
18
22
USE_X_PREFIX=	yes
19
USE_X_PREFIX=	yes
23
USE_PYTHON=	2.3+
20
USE_PYTHON=	2.3+
(-)net-im/gajim/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (gajim-0.10.tar.bz2) = 0d568857ea25acf8366cff43d2317757
1
MD5 (gajim-0.10.1.tar.bz2) = 392d9d1e06f6db49a892b9aea4a178c7
2
SHA256 (gajim-0.10.tar.bz2) = 77b0069e4283d1905ba640a7fa87d2f8acac4248c9b58de7f3d1fdffc86d4c2a
2
SHA256 (gajim-0.10.1.tar.bz2) = b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
3
SIZE (gajim-0.10.tar.bz2) = 2073760
3
SIZE (gajim-0.10.1.tar.bz2) = 2066396
(-)net-im/gajim/files/patch-Changeset6314 (-39 lines)
Lines 1-39 Link Here
1
diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py
2
--- src/common/proxy65_manager.py	Mon May  1 18:49:14 2006
3
+++ src/common/proxy65_manager.py	Tue May 16 19:55:10 2006
4
@@ -15,6 +15,7 @@
5
 ##
6
 import socket 
7
 import struct
8
+import errno
9
 
10
 import common.xmpp
11
 from common import gajim
12
@@ -246,16 +247,18 @@
13
 			self._recv=self._sock.recv
14
 		except Exception, ee:
15
 			(errnum, errstr) = ee
16
-			if errnum == 111:
17
-				self.on_failure()
18
-				return None
19
+			if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): 
20
+				# still trying to connect
21
+				return
22
 			# win32 needs this
23
-			elif errnum != 10056 or self.state != 0:
24
-				return None
25
-			else: # socket is already connected
26
-				self._sock.setblocking(False)
27
-				self._send=self._sock.send
28
-				self._recv=self._sock.recv
29
+			if errnum not in (0, 10056, errno.EISCONN):
30
+				# connection failed
31
+				self.on_failure()
32
+				return
33
+			# socket is already connected
34
+			self._sock.setblocking(False)
35
+			self._send=self._sock.send
36
+			self._recv=self._sock.recv
37
 		self.buff = ''
38
 		self.state = 1 # connected
39
 		self.idlequeue.plug_idle(self, True, False)

Return to bug 98770