From f77f5f664663a134989864cfa89de93e9e9c383f Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Thu, 18 Jul 2013 14:03:13 +0200
Subject: [PATCH] support version 2 of message carbons

---
 src/common/connection_handlers_events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index d730fd16c6..f044bfd313 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1048,7 +1048,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
                 namespace=nbxmpp.NS_CARBONS)
         # Be sure it comes from one of our resource, else ignore forward element
         if carbon_marker and self.jid == gajim.get_jid_from_account(account):
-            forward_tag = self.stanza.getTag('forwarded',
+            forward_tag = carbon_marker.getTag('forwarded',
                 namespace=nbxmpp.NS_FORWARD)
             if forward_tag:
                 msg = forward_tag.getTag('message')
-- 
GitLab