From 77efd83463aa0b1c36d80e40ca6e13e0c66938d2 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Fri, 10 May 2013 23:06:14 +0300 Subject: [PATCH] Make sure that the COLIBRI namespace is used for 'payload-type' children of COLIBRI 'channel' elements. This is to fix an issue where in certain cases a Jingle namespace was used, and the resulting 'conference' IQs would confuse the videobridge. --- .../jabber/extensions/colibri/ColibriConferenceIQ.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java index b86df2a58..563c15b62 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java @@ -339,6 +339,11 @@ public boolean addPayloadType(PayloadTypePacketExtension payloadType) if (payloadType == null) throw new NullPointerException("payloadType"); + // Make sure that the COLIBRI namespace is used. + payloadType.setNamespace(null); + for (ParameterPacketExtension p : payloadType.getParameters()) + p.setNamespace(null); + return payloadTypes.contains(payloadType) ? false