use correct JID when we receive a file-completed event depending if we send or receive the file. See #1553
This commit is contained in:
parent
559307912e
commit
34e8e0c950
1 changed files with 4 additions and 2 deletions
|
@ -992,7 +992,6 @@ class Interface:
|
||||||
# We add it to the awaiting_events queue
|
# We add it to the awaiting_events queue
|
||||||
# Do we have a queue?
|
# Do we have a queue?
|
||||||
jid = gajim.get_jid_without_resource(jid)
|
jid = gajim.get_jid_without_resource(jid)
|
||||||
print 'add_event', account, jid, typ
|
|
||||||
qs = gajim.awaiting_events[account]
|
qs = gajim.awaiting_events[account]
|
||||||
no_queue = False
|
no_queue = False
|
||||||
if not qs.has_key(jid):
|
if not qs.has_key(jid):
|
||||||
|
@ -1097,7 +1096,10 @@ class Interface:
|
||||||
if file_props.has_key('stalled') and file_props['stalled'] or \
|
if file_props.has_key('stalled') and file_props['stalled'] or \
|
||||||
file_props.has_key('paused') and file_props['paused']:
|
file_props.has_key('paused') and file_props['paused']:
|
||||||
return
|
return
|
||||||
jid = unicode(file_props['sender'])
|
if file_props['type'] == 'r': # we receive a file
|
||||||
|
jid = unicode(file_props['sender'])
|
||||||
|
else: # we send a file
|
||||||
|
jid = unicode(file_props['receiver'])
|
||||||
|
|
||||||
if gajim.popup_window(account):
|
if gajim.popup_window(account):
|
||||||
if file_props['error'] == 0:
|
if file_props['error'] == 0:
|
||||||
|
|
Loading…
Add table
Reference in a new issue