copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

we now catch the errors when we connect and when we authentificat to the server

Browse source
This commit is contained in:
Yann Leboulanger 2005-05-11 16:37:01 +00:00
parent 1e50542793
commit 88f4449fbb
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/connection.py
View file

@ -514,12 +514,13 @@ class Connection:
#connection=common.xmlstream.TCP_SSL, port=5223, proxy = proxy)
con.RegisterDisconnectHandler(self._disconnectedCB)
try:
con.connect(proxy=proxy, tls=usetls) #FIXME: blocking
c = con.connect(proxy=proxy, tls=usetls) #FIXME: blocking
except:
c = None
if not c:
gajim.log.debug('Couldn\'t connect to %s' % hostname)
self.dispatch('STATUS', 'offline')
self.dispatch('ERROR', _('Couldn\'t connect to %s') \
% hostname)
self.dispatch('ERROR', _('Couldn\'t connect to %s') % hostname)
self.connected = 0
return None
@ -549,7 +550,14 @@ class Connection:
gajim.log.debug('Connected to server')
if con.auth(name, self.password, resource): #FIXME: blocking
try:
auth = con.auth(name, self.password, resource) #FIXME: blocking
except IOError: #probably a timeout
self.dispatch('STATUS', 'offline')
self.dispatch('ERROR', _('Couldn\'t connect to %s') % hostname)
self.connected = 0
return None
if auth:
con.initRoster()
self.connected = 2
return con