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

fix logic. thanks Jim for report

This commit is contained in:
Nikos Kouremenos 2006-03-27 22:42:42 +00:00
parent 0552932253
commit 0bd9e77fc9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/helpers.py
View File

@ -720,9 +720,9 @@ def sanitize_filename(filename):
def allow_showing_notification(account): def allow_showing_notification(account):
'''is it allowed to show nofication?''' '''is it allowed to show nofication?'''
if config.get('notify_on_new_message'): if gajim.config.get('notify_on_new_message'):
# check OUR status and if we allow notifications for that status # check OUR status and if we allow notifications for that status
if config.get('autopopupaway'): # always show notification if gajim.config.get('autopopupaway'): # always show notification
return True return True
if connections[account].connected in (2, 3): # we're online or chat if connections[account].connected in (2, 3): # we're online or chat
return True return True
@ -730,8 +730,8 @@ def allow_showing_notification(account):
def allow_popup_window(account): def allow_popup_window(account):
'''is it allowed to popup windows?''' '''is it allowed to popup windows?'''
autopopup = config.get('autopopup') autopopup = gajim.config.get('autopopup')
autopopupaway = config.get('autopopupaway') autopopupaway = gajim.config.get('autopopupaway')
if autopopup and (autopopupaway or connections[account].connected in (2, 3)): if autopopup and (autopopupaway or connections[account].connected in (2, 3)):
return True return True
return False return False