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

Not sure why this was removed (I added it in 3395, dkirov removed it in 3461) but it broke chatstates. Readded.

This commit is contained in:
Travis Shirk 2005-09-08 02:05:46 +00:00
parent 7962dac8a3
commit 585a007c2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gajim.py
View File

@ -382,9 +382,10 @@ class Interface:
not gajim.contacts[account].has_key(jid): not gajim.contacts[account].has_key(jid):
return return
# Handle chat states
contact = gajim.get_first_contact_instance_from_jid(account, jid)
if self.windows[account]['chats'].has_key(jid): if self.windows[account]['chats'].has_key(jid):
chat_win = self.windows[account]['chats'][jid] chat_win = self.windows[account]['chats'][jid]
contact = gajim.get_first_contact_instance_from_jid(account, jid)
if chatstate is not None: # he sent us reply, so he supports jep85 if chatstate is not None: # he sent us reply, so he supports jep85
if contact.chatstate == 'ask': # we were jep85 disco? if contact.chatstate == 'ask': # we were jep85 disco?
contact.chatstate = 'active' # no more contact.chatstate = 'active' # no more
@ -393,6 +394,10 @@ class Interface:
else: else:
# got no valid jep85 answer, peer does not support it # got no valid jep85 answer, peer does not support it
contact.chatstate = False contact.chatstate = False
else:
# Brand new message, incoming.
if chatstate == 'active':
contact.chatstate = chatstate
if not array[1]: #empty message text if not array[1]: #empty message text
return return