copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix multiple metacontact requests at startup

Browse source 
_continue_connection_request_privacy() should only trigger
once after we received the discoinfo on the hostname.

We do a discoinfo on all items that the server offers,
_continue_connection_request_privacy() was triggered on every received
discoinfo again, hence requesting metacontacts and delimiters again.

also _continue_connection_request_privacy() was called on every
discoinfo error, instead of only on a hostname discoinfo error.

This bug is only triggered if the server doesnt support privacy rules.
This commit is contained in:
Philipp Hörist 2017-07-20 01:39:14 +02:00
parent a754c05979
commit 5e1e4e27e7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gajim/common/connection.py
View file

@ -1867,7 +1867,8 @@ class Connection(CommonConnection, ConnectionHandlers):
def _nec_agent_info_error_received(self, obj): def _nec_agent_info_error_received(self, obj):
if obj.conn.name != self.name: if obj.conn.name != self.name:
return return
if obj.id_[:6] == 'Gajim_': hostname = gajim.config.get_per('accounts', self.name, 'hostname')
if obj.id_[:6] == 'Gajim_' and obj.fjid == hostname:
self._continue_connection_request_privacy() self._continue_connection_request_privacy()
def _nec_agent_info_received(self, obj): def _nec_agent_info_received(self, obj):
@ -1957,6 +1958,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self.privacy_rules_supported = True self.privacy_rules_supported = True
get_action(self.name + '-privacylists').set_enabled(True) get_action(self.name + '-privacylists').set_enabled(True)
self._continue_connection_request_privacy()
if nbxmpp.NS_BYTESTREAM in obj.features and \ if nbxmpp.NS_BYTESTREAM in obj.features and \
gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
our_fjid = helpers.parse_jid(our_jid + '/' + \ our_fjid = helpers.parse_jid(our_jid + '/' + \
@ -1973,7 +1976,6 @@ class Connection(CommonConnection, ConnectionHandlers):
self.available_transports[transport_type].append(obj.fjid) self.available_transports[transport_type].append(obj.fjid)
else: else:
self.available_transports[transport_type] = [obj.fjid] self.available_transports[transport_type] = [obj.fjid]
self._continue_connection_request_privacy()
def send_custom_status(self, show, msg, jid): def send_custom_status(self, show, msg, jid):
if not show in gajim.SHOW_LIST: if not show in gajim.SHOW_LIST: