changeset 7c3c64bae081 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=7c3c64bae081 description: prevent bug when merging metacontacts

diffstat:

src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 2a7f8d66f29a -r 7c3c64bae081 src/roster_window.py --- a/src/roster_window.py Wed Dec 30 11:10:11 2009 +0100 +++ b/src/roster_window.py Tue Dec 29 16:02:50 2009 +0100 @@ -3954,6 +3954,9 @@ _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) + if not _contact: + # One of the metacontacts may be not connected. + continue

_contact.groups = c_dest.groups[:] gajim.contacts.add_metacontact(account_dest, c_dest.jid,