From 7387d779c0077ede18e044bc16505e1c5d9c3342 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 22 Feb 2010 09:57:59 +0100 Subject: [PATCH] don't traceback when using metacontact over several accounts. Fixes #5616 --- AUTHORS | 10 +++++----- src/gui_interface.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 3d1502324..7f4816bae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,13 +1,8 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: @@ -15,3 +10,8 @@ Stefan Bethge (stefan AT lanpartei.de) Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff --git a/src/gui_interface.py b/src/gui_interface.py index ea73e2869..a7d82699e 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -480,6 +480,8 @@ class Interface: jid_ = info['jid'] c_ = gajim.contacts.get_contact_with_highest_priority( acct_, jid_) + if not c_: + continue if c_.show not in ('offline', 'error'): show_notif = False break