diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2010-12-09 09:06:06 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2010-12-09 09:06:06 +0000 |
| commit | 59613edae5185049758b3e657e66236037a28545 (patch) | |
| tree | 694937a9387ed49d8bed9237ebc5a5970d755f70 | |
| parent | ea560ebbd6b186166016f329cd1044721f6e27cf (diff) | |
| download | jitsi-59613edae5185049758b3e657e66236037a28545.zip jitsi-59613edae5185049758b3e657e66236037a28545.tar.gz jitsi-59613edae5185049758b3e657e66236037a28545.tar.bz2 | |
Send each media content in separate transport-info for interoperability with Empathy and N900 mobile phones. Note that Empathy/gabble team has fixed a bug related to transport-info that prevent us to receive a video call from Empathy. When the new version of Empathy (that include the fix) will be packaged for the different Linux distributions, we will rollback this changes.
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java index 855f9a7..d6e6721 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java @@ -474,12 +474,31 @@ public class IceUdpTransportManager } transportInfoContent.addChildExtension( JingleUtils.createTransport(stream)); + + /* We send each media content in separate transport-info. + * It is absolutely not mandatory (we can simply send all + * content in one transport-info) but the XMPP Jingle client + * Empathy (via telepathy-gabble), which is present on many + * Linux distributions and N900 mobile phone, has a bug when + * it receives more than one content in transport-info. + * + * The related bug has been fixed in mainstream but the + * Linux distributions have not updated their packages yet. + * That's why we made this modification to be fully + * interoperable with Empathy right now. + * + * In the future, we will get back to the original behavior: + * sending all content in one transport-info. + */ + transportInfoContents.clear(); transportInfoContents.add(transportInfoContent); + + transportInfoSender.sendTransportInfo(transportInfoContents); } } - if (transportInfoSender != null) - transportInfoSender.sendTransportInfo(transportInfoContents); + //if (transportInfoSender != null) + // transportInfoSender.sendTransportInfo(transportInfoContents); this.cpeList = ourAnswer; } |