Do not play incoming message sound when message from unknown contact and ignore_unknown_contacts
Fixes #1970.
This commit is contained in:
parent
c462cbba16
commit
6d0e6b5289
|
@ -507,6 +507,10 @@ class Interface:
|
||||||
if not message: # empty message text
|
if not message: # empty message text
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if gajim.config.get('ignore_unknown_contacts') and \
|
||||||
|
not gajim.contacts.get_contact(account, jid) and not pm:
|
||||||
|
return
|
||||||
|
|
||||||
first = False
|
first = False
|
||||||
if not chat_control and not gajim.awaiting_events[account].has_key(
|
if not chat_control and not gajim.awaiting_events[account].has_key(
|
||||||
jid_of_control):
|
jid_of_control):
|
||||||
|
@ -541,11 +545,6 @@ class Interface:
|
||||||
groupchat_control.on_private_message(nick, message, array[2])
|
groupchat_control.on_private_message(nick, message, array[2])
|
||||||
return
|
return
|
||||||
|
|
||||||
# THIS HAS TO BE AFTER PM handling so we can get PMs
|
|
||||||
if gajim.config.get('ignore_unknown_contacts') and \
|
|
||||||
not gajim.contacts.get_contact(account, jid):
|
|
||||||
return
|
|
||||||
|
|
||||||
if first:
|
if first:
|
||||||
if gajim.config.get('notify_on_new_message') and \
|
if gajim.config.get('notify_on_new_message') and \
|
||||||
helpers.allow_showing_notification(account):
|
helpers.allow_showing_notification(account):
|
||||||
|
|
Loading…
Reference in New Issue