Commit 8194bd04 authored by Yann Leboulanger's avatar Yann Leboulanger

use 'muc_message_received' sound if it is enable without checking...

use 'muc_message_received' sound if it is enable without checking notify_on_all_muc_messages option. Fixes #2494
parent c6003643
......@@ -365,7 +365,7 @@ class Config:
'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
'message_sent': [ True, '../data/sounds/sent.wav' ],
'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname.')],
'muc_message_received': [ True, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)') ],
'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
}
themes_default = {
......
......@@ -599,8 +599,7 @@ class GroupchatControl(ChatControlBase):
# Do we play a sound on every muc message?
if gajim.config.get_per('soundevents', 'muc_message_received', 'enabled'):
if gajim.config.get('notify_on_all_muc_messages'):
sound = 'received'
sound = 'received'
# Are any of the defined highlighting words in the text?
if self.needs_visual_notification(text):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment