# HG changeset patch # User franky # Date 1413578527 -7200 # Node ID 634cc23e8c1c5764623d17d12170b3fb7d67e5d9 # Parent f51c341a9da51f04bd4b762036676ea0515a0841 Use a #define for the xep-297 protocol namespace diff -r f51c341a9da5 -r 634cc23e8c1c mcabber/mcabber/xmpp.c --- a/mcabber/mcabber/xmpp.c Fri Oct 17 22:39:05 2014 +0200 +++ b/mcabber/mcabber/xmpp.c Fri Oct 17 22:42:07 2014 +0200 @@ -1101,7 +1101,7 @@ // Parse a message that is send to one of our other resources if (!g_strcmp0(x->name, "received")) { // Go 1 level deeper to the forwarded message - x = lm_message_node_find_xmlns(x, "urn:xmpp:forward:0"); + x = lm_message_node_find_xmlns(x, NS_FORWARD); x = lm_message_node_get_child(x, "message"); from = lm_message_node_get_attribute(x, "from"); @@ -1125,7 +1125,7 @@ scr_LogPrint(LPRINT_DEBUG, "Received incoming carbon from <%s>", from); } else if (!g_strcmp0(x->name, "sent")) { - x = lm_message_node_find_xmlns(x, "urn:xmpp:forward:0"); + x = lm_message_node_find_xmlns(x, NS_FORWARD); x = lm_message_node_get_child(x, "message"); const char *to= lm_message_node_get_attribute(x, "to"); diff -r f51c341a9da5 -r 634cc23e8c1c mcabber/mcabber/xmpp_defines.h --- a/mcabber/mcabber/xmpp_defines.h Fri Oct 17 22:39:05 2014 +0200 +++ b/mcabber/mcabber/xmpp_defines.h Fri Oct 17 22:42:07 2014 +0200 @@ -62,6 +62,7 @@ #define NS_RECEIPTS "urn:xmpp:receipts" #define NS_CARBONS_2 "urn:xmpp:carbons:2" // XEP-0280 (message carbons) +#define NS_FORWARD "urn:xmpp:forward:0" // XEP-0297 (stanza forwarding) #define NS_JABBERD_STOREDPRESENCE "http://jabberd.org/ns/storedpresence" #define NS_JABBERD_HISTORY "http://jabberd.org/ns/history"