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

we can now send pep thing to a zeroconf connection objec, it will just send nothing. so GUI doesn't have to know it's a zeroconf connection or not. fixes #5432

Browse source
This commit is contained in:
Yann Leboulanger 2009-11-19 20:36:40 +01:00
parent 909ef8da53
commit d664daad1a
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/zeroconf/connection_handlers_zeroconf.py
View file

@ -35,6 +35,7 @@ from common import helpers
from common import gajim from common import gajim
from common.zeroconf import zeroconf from common.zeroconf import zeroconf
from common.commands import ConnectionCommands from common.commands import ConnectionCommands
from common.pep import ConnectionPEP
import logging import logging
log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf')
@ -376,7 +377,7 @@ class ConnectionBytestream(connection_handlers.ConnectionBytestream):
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream, class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream,
ConnectionCommands, connection_handlers.ConnectionHandlersBase): ConnectionCommands, ConnectionPEP, connection_handlers.ConnectionHandlersBase):
def __init__(self): def __init__(self):
ConnectionVcard.__init__(self) ConnectionVcard.__init__(self)
ConnectionBytestream.__init__(self) ConnectionBytestream.__init__(self)

2
src/gui_interface.py
View file

@ -2812,8 +2812,6 @@ class Interface:
for acct in accounts: for acct in accounts:
if not gajim.account_is_connected(acct): if not gajim.account_is_connected(acct):
continue continue
if gajim.connections[acct].is_zeroconf:
continue
if not gajim.config.get_per('accounts', acct, 'publish_tune'): if not gajim.config.get_per('accounts', acct, 'publish_tune'):
continue continue
if gajim.connections[acct].music_track_info == music_track_info: if gajim.connections[acct].music_track_info == music_track_info:

6
src/roster_window.py
View file

@ -1898,9 +1898,7 @@ class RosterWindow:
def send_pep(self, account, pep_dict): def send_pep(self, account, pep_dict):
connection = gajim.connections[account] connection = gajim.connections[account]
if connection.is_zeroconf:
return
if 'activity' in pep_dict: if 'activity' in pep_dict:
activity = pep_dict['activity'] activity = pep_dict['activity']
subactivity = pep_dict.get('subactivity', None) subactivity = pep_dict.get('subactivity', None)
@ -1917,8 +1915,6 @@ class RosterWindow:
connection.retract_mood() connection.retract_mood()
def delete_pep(self, jid, account): def delete_pep(self, jid, account):
if gajim.connections[account].is_zeroconf:
return
if jid == gajim.get_jid_from_account(account): if jid == gajim.get_jid_from_account(account):
gajim.connections[account].pep = {} gajim.connections[account].pep = {}
self.draw_account(account) self.draw_account(account)