diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2015-07-21 17:21:31 -0500 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2015-07-21 17:21:50 -0500 |
| commit | c6b42c0b1a016a10164fd4c5c3feec5e7ce3b7f8 (patch) | |
| tree | a13d5c5ce60d6e815f42bbecfb7d94002b54e7a3 /src/net/java/sip/communicator/impl | |
| parent | 32a99c7c05d35bac5e080303dbfd850b9622a854 (diff) | |
| download | jitsi-c6b42c0b1a016a10164fd4c5c3feec5e7ce3b7f8.zip jitsi-c6b42c0b1a016a10164fd4c5c3feec5e7ce3b7f8.tar.gz jitsi-c6b42c0b1a016a10164fd4c5c3feec5e7ce3b7f8.tar.bz2 | |
Avoids a compile-time ambiguity of a class
Diffstat (limited to 'src/net/java/sip/communicator/impl')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java index 11414ce..526edef 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java @@ -24,7 +24,6 @@ import org.jivesoftware.smack.packet.*; import org.jivesoftware.smack.provider.*; import org.jivesoftware.smackx.*; import org.jivesoftware.smackx.bytestreams.ibb.provider.*; -import org.jivesoftware.smackx.bytestreams.socks5.provider.*; import org.jivesoftware.smackx.packet.*; import org.jivesoftware.smackx.provider.*; @@ -166,7 +165,7 @@ public class ProviderManagerExt addProvider("si", "http://jabber.org/protocol/si", StreamInitiationProvider.class); addProvider("query", "http://jabber.org/protocol/bytestreams", - BytestreamsProvider.class); + org.jivesoftware.smackx.bytestreams.socks5.provider.BytestreamsProvider.class); addProvider("open", "http://jabber.org/protocol/ibb", OpenIQProvider.class); addProvider("data", "http://jabber.org/protocol/ibb", |