Author: asterix Date: 2008-08-28 14:24:31 +0200 (Thu, 28 Aug 2008) New Revision: 10334

Modified: trunk/src/common/connection_handlers.py Log: handle correctly forwarded messages. fixes #4246

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-08-28 12:11:01 UTC (rev 10333) +++ trunk/src/common/connection_handlers.py 2008-08-28 12:24:31 UTC (rev 10334) @@ -1641,8 +1641,6 @@ '''Called when we receive a message''' gajim.log.debug('MessageCB')

- frm = helpers.get_full_jid_from_iq(msg) - # check if the message is pubsub#event if msg.getTag('event') is not None: if msg.getTag('error') is None: @@ -1654,6 +1652,18 @@ self._HttpAuthCB(con, msg) return

+ frm = helpers.get_full_jid_from_iq(msg) + jid = helpers.get_jid_from_iq(msg) + + addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS) + + # Be sure it comes from one of our resource, else ignore address element + if addressTag and jid == gajim.get_jid_from_account(self.name): + address = addressTag.getTag('address', attrs={'type': 'ofrom'}) + if address: + frm = address.getAttr('jid') + jid = gajim.get_jid_without_resource(frm) + # invitations invite = None encTag = msg.getTag('x', namespace=common.xmpp.NS_ENCRYPTED) @@ -1685,8 +1695,6 @@

msgtxt = msg.getBody()

- jid = helpers.get_jid_from_iq(msg) - encrypted = False xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO)

@@ -1765,15 +1773,6 @@ session.control.conv_textview.hide_xep0184_warning( msg.getID())

- addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS) - - # Be sure it comes from one of our resource, else ignore address element - if addressTag and jid == gajim.get_jid_from_account(self.name): - address = addressTag.getTag('address', attrs={'type': 'ofrom'}) - if address: - frm = address.getAttr('jid') - jid = gajim.get_jid_without_resource(frm) - if encTag and self.USE_GPG: encmsg = encTag.getData()