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

chatstates handling is back again. now with comment why this should stay where it is. also do and if-if a if-elif [thanks Jim for this]

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

11
src/gajim.py
View File

@ -451,8 +451,7 @@ class Interface:
def handle_event_msg(self, account, array): def handle_event_msg(self, account, array):
# ('MSG', account, (jid, msg, time, encrypted, msg_type, subject, # ('MSG', account, (jid, msg, time, encrypted, msg_type, subject,
# chatstate)) # chatstate))
if not array[1]: # empty message text
return
jid = gajim.get_jid_without_resource(array[0]) jid = gajim.get_jid_without_resource(array[0])
resource = gajim.get_resource_from_jid(array[0]) resource = gajim.get_resource_from_jid(array[0])
@ -473,8 +472,8 @@ class Interface:
if gajim.config.get_per('soundevents', 'first_message_received', if gajim.config.get_per('soundevents', 'first_message_received',
'enabled') and first: 'enabled') and first:
helpers.play_sound('first_message_received') helpers.play_sound('first_message_received')
if gajim.config.get_per('soundevents', 'next_message_received', elif gajim.config.get_per('soundevents', 'next_message_received',
'enabled') and not first: 'enabled'):
helpers.play_sound('next_message_received') helpers.play_sound('next_message_received')
jid_of_control = jid jid_of_control = jid
@ -538,6 +537,10 @@ class Interface:
if msg_id: # Do not overwrite an existing msg_id with None if msg_id: # Do not overwrite an existing msg_id with None
contact.msg_id = msg_id 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'):
if helpers.allow_showing_notification(account): if helpers.allow_showing_notification(account):