From d1bb5cbc74ee2f18900f7157e341fae0429843e0 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Mon, 27 Mar 2006 23:10:41 +0000 Subject: [PATCH] again fix logic after cut-paste --- src/common/helpers.py | 5 +++-- src/gajim.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/helpers.py b/src/common/helpers.py index 5ad9fc0ab..a5da080fd 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -724,7 +724,7 @@ def allow_showing_notification(account): # check OUR status and if we allow notifications for that status if gajim.config.get('autopopupaway'): # always show notification return True - if connections[account].connected in (2, 3): # we're online or chat + if gajim.connections[account].connected in (2, 3): # we're online or chat return True return False @@ -732,6 +732,7 @@ def allow_popup_window(account): '''is it allowed to popup windows?''' autopopup = gajim.config.get('autopopup') autopopupaway = gajim.config.get('autopopupaway') - if autopopup and (autopopupaway or connections[account].connected in (2, 3)): + if autopopup and (autopopupaway or \ + gajim.connections[account].connected in (2, 3)): # we're online or chat return True return False diff --git a/src/gajim.py b/src/gajim.py index 7b0a18121..d5316ac4b 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -319,8 +319,8 @@ class Interface: ji = jid.replace('@', '') else: ji = jid - # Update contact + # Update contact jid_list = gajim.contacts.get_jid_list(account) if ji in jid_list: lcontact = gajim.contacts.get_contacts_from_jid(account, ji)