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

use 'muc_message_received' sound if it is enable without checking notify_on_all_muc_messages option. Fixes #2494

Browse source
This commit is contained in:
Yann Leboulanger 2006-10-11 17:03:25 +00:00
parent c600364342
commit 8194bd0480
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/config.py
View file

@ -365,7 +365,7 @@ class Config:
'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ], 'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
'message_sent': [ True, '../data/sounds/sent.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_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 = { themes_default = {

1
src/groupchat_control.py
View file

@ -599,7 +599,6 @@ class GroupchatControl(ChatControlBase):
# Do we play a sound on every muc message? # Do we play a sound on every muc message?
if gajim.config.get_per('soundevents', 'muc_message_received', 'enabled'): 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? # Are any of the defined highlighting words in the text?