[Dicson] option have moved per account. Fixes #4748

src/chat_control.py

@@ -1622,7 +1622,8 @@ class ChatControl(ChatControlBase):
 			ChatControlBase.print_conversation_line(self, msg,
 				'status', '', None)
 
-			loggable = gajim.config.get('log_encrypted_sessions')
+			loggable = gajim.config.get_per('accounts', self.account,
+				'log_encrypted_sessions')
 
 			if self.session:
 				self.session.loggable = loggable

src/common/connection_handlers.py

@@ -1550,7 +1550,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		qp = iq_obj.getTag('query')
 		qp.setTagData('name', 'Gajim')
 		qp.setTagData('version', gajim.version)
-		send_os = gajim.config.get('send_os_info')
+		send_os = gajim.config.get_per('accounts', self.name, 'send_os_info')
 		if send_os:
 			qp.setTagData('os', helpers.get_os_info())
 		self.connection.send(iq_obj)

src/common/stanza_session.py

@@ -246,7 +246,7 @@ class EncryptedStanzaSession(StanzaSession):
 			return crypto.encode_mpi(gajim.pubkey.sign(hash_, '')[0])
 
 	def encrypt_stanza(self, stanza):
-		encryptable = [x for x in stanza.getChildren() if x.getName() not in 
+		encryptable = [x for x in stanza.getChildren() if x.getName() not in
 			('error', 'amp', 'thread')]
 
 		# FIXME can also encrypt contents of <error/> elements in stanzas @type =
@@ -353,7 +353,8 @@ class EncryptedStanzaSession(StanzaSession):
 		return self.decrypter.decrypt(ciphertext)
 
 	def logging_preference(self):
-		if gajim.config.get('log_encrypted_sessions'):
+		if gajim.config.get_per('accounts', self.conn.name,
+		'log_encrypted_sessions'):
 			return ['may', 'mustnot']
 		else:
 			return ['mustnot', 'may']
@@ -989,7 +990,7 @@ class EncryptedStanzaSession(StanzaSession):
 	def fail_bad_negotiation(self, reason, fields=None):
 		'''
 		Sends an error and cancels everything.
-		
+
 		If fields is None, the remote party has given us a bad cryptographic
 		value of some kind. Otherwise, list the fields we haven't implemented
 		'''

src/session.py

@@ -184,8 +184,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 		if not msgtxt: # empty message text
 			return
 
-		if gajim.config.get('ignore_unknown_contacts') and \
-		not gajim.contacts.get_contacts(self.conn.name, jid) and not pm:
+		if gajim.config.get_per('accounts', self.conn.name,
+		'ignore_unknown_contacts') and not gajim.contacts.get_contacts(
+		self.conn.name, jid) and not pm:
 			return
 
 		if not contact: