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

do not play sound on recv chatstates. also comment on this so at last that code is somehow readable. thx Jim for report

This commit is contained in:
Nikos Kouremenos 2006-03-27 23:06:26 +00:00
parent 7c0dca4dbd
commit a91654ba9b
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/gajim.py
View File

@ -464,7 +464,33 @@ class Interface:
jid = jid.replace('@', '') jid = jid.replace('@', '')
chat_control = self.msg_win_mgr.get_control(jid, account) chat_control = self.msg_win_mgr.get_control(jid, account)
# Handle chat states
contact = gajim.contacts.get_first_contact_from_jid(account, jid)
if contact:
contact.composing_jep = composing_jep
if chat_control and chat_control.type_id == message_control.TYPE_CHAT:
if chatstate is not None:
# other peer sent us reply, so he supports jep85 or jep22
contact.chatstate = chatstate
if contact.our_chatstate == 'ask': # we were jep85 disco?
contact.our_chatstate = 'active' # no more
chat_control.handle_incoming_chatstate()
elif contact.chatstate != 'active':
# got no valid jep85 answer, peer does not support it
contact.chatstate = False
elif contact and chatstate == 'active':
# Brand new message, incoming.
contact.our_chatstate = chatstate
contact.chatstate = chatstate
if msg_id: # Do not overwrite an existing msg_id with None
contact.msg_id = msg_id
# THIS MUST BE AFTER chatstates handling
# AND BEFORE playsound (else we here sounding on chatstates!)
if not array[1]: # empty message text
return
first = False first = False
if not chat_control and not gajim.awaiting_events[account].has_key(jid): if not chat_control and not gajim.awaiting_events[account].has_key(jid):
first = True first = True
@ -515,31 +541,6 @@ class Interface:
elif resource != highest_contact.resource: elif resource != highest_contact.resource:
chat_control = None chat_control = None
jid_of_control = fjid jid_of_control = fjid
# Handle chat states
contact = gajim.contacts.get_first_contact_from_jid(account, jid)
if contact:
contact.composing_jep = composing_jep
if chat_control and chat_control.type_id == message_control.TYPE_CHAT:
if chatstate is not None:
# other peer sent us reply, so he supports jep85 or jep22
contact.chatstate = chatstate
if contact.our_chatstate == 'ask': # we were jep85 disco?
contact.our_chatstate = 'active' # no more
chat_control.handle_incoming_chatstate()
elif contact.chatstate != 'active':
# got no valid jep85 answer, peer does not support it
contact.chatstate = False
elif contact and chatstate == 'active':
# Brand new message, incoming.
contact.our_chatstate = chatstate
contact.chatstate = chatstate
if msg_id: # Do not overwrite an existing msg_id with None
contact.msg_id = msg_id
# THIS MUST BE AFTER chatstates handling
if not array[1]: # empty message text
return
if not chat_control and not gajim.awaiting_events[account].has_key(jid): if not chat_control and not gajim.awaiting_events[account].has_key(jid):
if gajim.config.get('notify_on_new_message'): if gajim.config.get('notify_on_new_message'):