no more force_nonSASL option

src/common/config.py

@@ -119,7 +119,6 @@ class Config:
 			'keyid': [ opt_str, '' ],
 			'keyname': [ opt_str, '' ],
 			'usessl': [ opt_bool, False ],
-			'force_nonSASL': [ opt_bool, False ],
 			'savegpgpass': [ opt_bool, False ],
 			'gpgpassword': [ opt_str, '' ],
 			'sync_with_global_status': [ opt_bool, True ],

src/common/connection.py

@@ -584,8 +584,7 @@ class Connection:
 
 		try:
 			#FIXME: blocking
-			auth = con.auth(name, self.password, resource, 1) #FIXME: non SASL doesn't work currently
-#				not gajim.config.get_per('accounts', self.name, 'force_nonSASL'))
+			auth = con.auth(name, self.password, resource, 1)
 		except IOError: #probably a timeout
 			self.connected = 0
 			self.dispatch('STATUS', 'offline')