# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1270369898 -7200
# Node ID fe385f2cfb938db627441e9c6802f2a9a421e9c1
# Parent  fdb2f88b908b9e1e11e124377eb36645386f4719
Partial update for XEP-0184 v1.1
Added 'id' attribute to <received/> element

diff -r fdb2f88b908b -r fe385f2cfb93 mcabber/mcabber/xmpp.c
--- a/mcabber/mcabber/xmpp.c	Sun Apr 04 00:15:53 2010 +0200
+++ b/mcabber/mcabber/xmpp.c	Sun Apr 04 10:31:38 2010 +0200
@@ -1272,11 +1272,15 @@
                lm_message_node_find_xmlns(m->node, NS_SIGNED));
   // Report received message if message receipt was requested
   if (lm_message_node_get_child(m->node, "request")) {
+    const gchar *mid;
+    LmMessageNode *y;
     LmMessage *rcvd = lm_message_new(from, LM_MESSAGE_TYPE_MESSAGE);
-    lm_message_node_set_attribute(rcvd->node, "id", lm_message_get_id(m));
-    lm_message_node_set_attribute
-            (lm_message_node_add_child(rcvd->node, "received", NULL),
-             "xmlns", NS_RECEIPTS);
+    mid = lm_message_get_id(m);
+    // For backward compatibility (XEP184 < v.1.1):
+    lm_message_node_set_attribute(rcvd->node, "id", mid);
+    y = lm_message_node_add_child(rcvd->node, "received", NULL);
+    lm_message_node_set_attribute(y, "xmlns", NS_RECEIPTS);
+    lm_message_node_set_attribute(y, "id", mid);
     lm_connection_send(connection, rcvd, NULL);
     lm_message_unref(rcvd);
   }