From d6e6a5d62d62bc4d3775d60a2525799db5c4e5df Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Tue, 17 Nov 2009 23:17:08 +0100 Subject: [PATCH] Do not try to send (and fail) sending PEP via Zeroconf. Fixes #5432. --- src/common/pep.py | 2 +- src/gui_interface.py | 2 ++ src/roster_window.py | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/common/pep.py b/src/common/pep.py index 21861c5e2..742325b4c 100644 --- a/src/common/pep.py +++ b/src/common/pep.py @@ -555,7 +555,7 @@ class ConnectionPEP(object): if not self.pep_supported: return # not all server support retract, so send empty pep first - self.send_tune(None) + self.send_nickname(None) self.send_pb_retract('', xmpp.NS_NICK, '0') diff --git a/src/gui_interface.py b/src/gui_interface.py index 98c1f3298..9cb53d646 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2812,6 +2812,8 @@ class Interface: for acct in accounts: if not gajim.account_is_connected(acct): continue + if gajim.connections[acct].is_zeroconf: + continue if not gajim.config.get_per('accounts', acct, 'publish_tune'): continue if gajim.connections[acct].music_track_info == music_track_info: diff --git a/src/roster_window.py b/src/roster_window.py index 6cef52f35..25780f85c 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1898,6 +1898,8 @@ class RosterWindow: def send_pep(self, account, pep_dict): connection = gajim.connections[account] + if connection.is_zeroconf: + return if 'activity' in pep_dict: activity = pep_dict['activity'] @@ -1915,6 +1917,8 @@ class RosterWindow: connection.retract_mood() def delete_pep(self, jid, account): + if gajim.connections[account].is_zeroconf: + return if jid == gajim.get_jid_from_account(account): gajim.connections[account].pep = {} self.draw_account(account)