diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2006-10-11 21:03:25 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2006-10-11 21:03:25 +0400 |
| commit | 8194bd048038ef388d67d8977e8f55693879c697 (patch) | |
| tree | a7ae5dbe125cda8d4d9e2edac3110628453bfdd0 /src | |
| parent | c600364342cb1b90402a0feedf0a5ac22f9bcd2d (diff) | |
use 'muc_message_received' sound if it is enable without checking notify_on_all_muc_messages option. Fixes #2494
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/config.py | 2 | ||||
| -rw-r--r-- | src/groupchat_control.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/common/config.py b/src/common/config.py index 960b39516..8cd7f5815 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -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 = { diff --git a/src/groupchat_control.py b/src/groupchat_control.py index c4484530e..09e68c10d 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -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): |