From 15bfa2e095abc9818c4e2921500085f6cf48708c Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 22 Sep 2006 08:17:25 +0000 Subject: [PATCH] handle correctly full_jid / jid in events (try to find one with fulljid before trying with jid). SHould fix #2414 --- src/gajim.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index 609fafd13..a8d35ee6a 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -605,7 +605,7 @@ class Interface: msg = message if subject: msg = _('Subject: %s') % subject + '\n' + msg - notify.notify('new_message', jid, account, [msg_type, first, nickname, + notify.notify('new_message', full_jid_with_resource, account, [msg_type, first, nickname, msg], advanced_notif_num) if self.remote_ctrl: @@ -1762,7 +1762,10 @@ class Interface: elif type_ in ('normal', 'file-request', 'file-request-error', 'file-send-error', 'file-error', 'file-stopped', 'file-completed'): # Get the first single message event - event = gajim.events.get_first_event(account, jid, type_) + event = gajim.events.get_first_event(account, fjid, type_) + if not event: + # default to jid without resource + event = gajim.events.get_first_event(account, jid, type_) # Open the window self.roster.open_event(account, jid, event) elif type_ == 'gmail':