copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle correctly full_jid / jid in events (try to find one with fulljid before trying with jid). SHould fix #2414

This commit is contained in:
Yann Leboulanger 2006-09-22 08:17:25 +00:00
parent 28b2ba04ff
commit 15bfa2e095
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gajim.py
View File

@ -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':