[telepathy-gabble/master] Revert "Include xmlns on contents"

Will Thompson will.thompson at collabora.co.uk
Sat Jun 27 05:09:33 PDT 2009


This reverts commit dfce1b44821700212f35951931dd5e6bc1942946, which was
completely wrong: <content> stanzas are in the same namespace as their
parent <jingle> node, not in the namespace of their <description>.

I made this change because the codepath for producing <content>s for the
purpose of transport-info actions (which was separate) did so, so that I
could delete the redundant path.
---
 src/jingle-content.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index c367301..d5a29bc 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -674,7 +674,6 @@ gabble_jingle_content_produce_node (GabbleJingleContent *c,
       lm_message_node_set_attributes (content_node,
           "name", priv->name,
           "senders", produce_senders (priv->senders),
-          "xmlns", priv->content_ns,
           NULL);
 
       if (gabble_jingle_content_creator_is_initiator (c))
-- 
1.5.6.5




More information about the telepathy-commits mailing list