* Add option 'dont_ack_s10n' to prevent the infinite loop with jabberd2...

* Add option 'dont_ack_s10n' to prevent the infinite loop with jabberd2 subscription acknowledgements.

src/common/config.py

@@ -227,6 +227,7 @@ class Config:
 			# try for 2 minutes before giving up (aka. timeout after those seconds)
 			'try_connecting_for_foo_secs': [ opt_int, 60 ],
 			'http_auth': [opt_str, 'ask'], # yes, no, ask
+			'dont_ack_s10n': [opt_bool, False],
 			# proxy65 for FT
 			'file_transfer_proxies': [opt_str, 
 			'proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de'],

src/gajim.py

@@ -650,7 +650,8 @@ class Interface:
 		dialogs.InformationDialog(_('Authorization accepted'),
 				_('The contact "%s" has authorized you to see his or her status.')
 				% jid)
-		gajim.connections[account].ack_subscribed(jid)
+		if not gajim.config.get_per('accounts',account,'dont_ack_s10n'):
+			gajim.connections[account].ack_subscribed(jid)
 		if self.remote_ctrl:
 			self.remote_ctrl.raise_signal('Subscribed', (account, array))