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

Fix logic, fix char code

This commit is contained in:
Jean-Marie Traissard 2008-03-30 21:16:35 +00:00
parent 75983ff571
commit 39d18c893d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/groupchat_control.py
View File

@ -761,9 +761,6 @@ class GroupchatControl(ChatControlBase):
text, the second, what sound to play.''' text, the second, what sound to play.'''
highlight, sound = (None, None) highlight, sound = (None, None)
# Do we play a sound on every muc message?
if gajim.config.get_per('soundevents', 'muc_message_received', 'enabled'):
sound = 'received'
# Are any of the defined highlighting words in the text? # Are any of the defined highlighting words in the text?
if self.needs_visual_notification(text): if self.needs_visual_notification(text):
@ -772,6 +769,11 @@ class GroupchatControl(ChatControlBase):
'enabled'): 'enabled'):
sound = 'highlight' sound = 'highlight'
# Do we play a sound on every muc message?
elif gajim.config.get_per('soundevents', 'muc_message_received', \
'enabled'):
sound = 'received'
# Is it a history message? Don't want sound-floods when we join. # Is it a history message? Don't want sound-floods when we join.
if tim != time.localtime(): if tim != time.localtime():
sound = None sound = None
@ -815,7 +817,7 @@ class GroupchatControl(ChatControlBase):
if (refer_to_nick_char != ''): if (refer_to_nick_char != ''):
refer_to_nick_char_code = ord(refer_to_nick_char) refer_to_nick_char_code = ord(refer_to_nick_char)
if ((refer_to_nick_char_code < 65 or \ if ((refer_to_nick_char_code < 65 or \
refer_to_nick_char_code > 123) or \ refer_to_nick_char_code > 122) or \
(refer_to_nick_char_code < 97 and \ (refer_to_nick_char_code < 97 and \
refer_to_nick_char_code > 90)): refer_to_nick_char_code > 90)):
return True return True