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

[Zash] update Carbon XEP (XEP-0280) to 0.6 version. Fixes #7093

Browse source
This commit is contained in:
Yann Leboulanger 2012-02-07 20:46:42 +01:00
parent 5bdd9da51d
commit 241acdd06b
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/common/connection_handlers_events.py
View file

@ -1016,15 +1016,20 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
return return
self.jid = gajim.get_jid_without_resource(self.fjid) self.jid = gajim.get_jid_without_resource(self.fjid)
forward_tag = self.stanza.getTag('forwarded', namespace=xmpp.NS_FORWARD) carbon_marker = self.stanza.getTag('sent', namespace=xmpp.NS_CARBONS)
if not carbon_marker:
carbon_marker = self.stanza.getTag('received', namespace=xmpp.NS_CARBONS)
# Be sure it comes from one of our resource, else ignore forward element # Be sure it comes from one of our resource, else ignore forward element
if forward_tag and self.jid == gajim.get_jid_from_account(account): if carbon_marker and self.jid == gajim.get_jid_from_account(account):
received_tag = forward_tag.getTag('received', forward_tag = self.stanza.getTag('forwarded', namespace=xmpp.NS_FORWARD)
namespace=xmpp.NS_CARBONS) if forward_tag:
sent_tag = forward_tag.getTag('sent', namespace=xmpp.NS_CARBONS)
if received_tag:
msg = forward_tag.getTag('message') msg = forward_tag.getTag('message')
self.stanza = xmpp.Message(node=msg) self.stanza = xmpp.Message(node=msg)
if carbon_marker.getName() == 'sent':
to = self.stanza.getTo()
self.stanza.setTo(self.stanza.getFrom())
self.stanza.setFrom(to)
self.sent = True
try: try:
self.get_jid_resource() self.get_jid_resource()
except helpers.InvalidFormat: except helpers.InvalidFormat:
@ -1035,23 +1040,6 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
'has been ignored.'))) 'has been ignored.')))
return return
self.forwarded = True self.forwarded = True
elif sent_tag:
msg = forward_tag.getTag('message')
self.stanza = xmpp.Message(node=msg)
to = self.stanza.getTo()
self.stanza.setTo(self.stanza.getFrom())
self.stanza.setFrom(to)
try:
self.get_jid_resource()
except helpers.InvalidFormat:
gajim.nec.push_incoming_event(InformationEvent(None,
conn=self.conn, level='error',
pri_txt=_('Invalid Jabber ID'),
sec_txt=_('A message from a non-valid JID arrived, it '
'has been ignored.')))
return
self.forwarded = True
self.sent = True
self.enc_tag = self.stanza.getTag('x', namespace=xmpp.NS_ENCRYPTED) self.enc_tag = self.stanza.getTag('x', namespace=xmpp.NS_ENCRYPTED)