Commit 15bfa2e0 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

handle correctly full_jid / jid in events (try to find one with fulljid before...

handle correctly full_jid / jid in events (try to find one with fulljid before trying with jid). SHould fix #2414
parent 28b2ba04
......@@ -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':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment