revert latest commit I did (sorry)
This commit is contained in:
parent
0c8b0bbde2
commit
0f66868a70
|
@ -767,15 +767,15 @@ class Connection:
|
|||
proxy = {'host': proxyhost, 'port': proxyport}
|
||||
else:
|
||||
proxy = None
|
||||
c = common.xmpp.Client(server = hostname)
|
||||
# try:
|
||||
c = common.xmpp.Client(server = hostname, debug = [])
|
||||
try:
|
||||
c.connect(proxy = proxy)
|
||||
# except:
|
||||
# gajim.log.debug('Couldn\'t connect to %s' % hostname)
|
||||
# self.dispatch('ERROR', _('Couldn\'t connect to ') + hostname)
|
||||
# return 0
|
||||
# else:
|
||||
gajim.log.debug('Connected to server')
|
||||
except:
|
||||
gajim.log.debug('Couldn\'t connect to %s' % hostname)
|
||||
self.dispatch('ERROR', _('Couldn\'t connect to ') + hostname)
|
||||
return 0
|
||||
else:
|
||||
gajim.log.debug(_('Connected to server'))
|
||||
req = common.xmpp.features.getRegInfo(c, hostname).asDict() # FIXME! This blocks!
|
||||
req['username'] = login
|
||||
req['password'] = password
|
||||
|
|
|
@ -25,5 +25,4 @@ version = '0.7'
|
|||
config = common.config.Config()
|
||||
connections = {}
|
||||
log = logging.getLogger('Gajim')
|
||||
log.setLevel(logging.DEBUG)
|
||||
logger = common.logger.Logger()
|
||||
|
|
Loading…
Reference in New Issue