no more force_nonSASL option
This commit is contained in:
parent
e05dc901d4
commit
9ad357ab3d
|
@ -119,7 +119,6 @@ class Config:
|
||||||
'keyid': [ opt_str, '' ],
|
'keyid': [ opt_str, '' ],
|
||||||
'keyname': [ opt_str, '' ],
|
'keyname': [ opt_str, '' ],
|
||||||
'usessl': [ opt_bool, False ],
|
'usessl': [ opt_bool, False ],
|
||||||
'force_nonSASL': [ opt_bool, False ],
|
|
||||||
'savegpgpass': [ opt_bool, False ],
|
'savegpgpass': [ opt_bool, False ],
|
||||||
'gpgpassword': [ opt_str, '' ],
|
'gpgpassword': [ opt_str, '' ],
|
||||||
'sync_with_global_status': [ opt_bool, True ],
|
'sync_with_global_status': [ opt_bool, True ],
|
||||||
|
|
|
@ -584,8 +584,7 @@ class Connection:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
#FIXME: blocking
|
#FIXME: blocking
|
||||||
auth = con.auth(name, self.password, resource, 1) #FIXME: non SASL doesn't work currently
|
auth = con.auth(name, self.password, resource, 1)
|
||||||
# not gajim.config.get_per('accounts', self.name, 'force_nonSASL'))
|
|
||||||
except IOError: #probably a timeout
|
except IOError: #probably a timeout
|
||||||
self.connected = 0
|
self.connected = 0
|
||||||
self.dispatch('STATUS', 'offline')
|
self.dispatch('STATUS', 'offline')
|
||||||
|
|
Loading…
Reference in New Issue