aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2016-05-28 18:11:09 +0200
committerIngo Bauersachs <ingo@jitsi.org>2016-05-28 18:11:09 +0200
commit1afb3d652955b469722a0c9ab960f8cd458e0321 (patch)
tree5f547d0d01e339e48f3e7543a8f9e13390745591 /src
parent3a3bf3158265bf1f8d06d7b30e8a143d499d6a72 (diff)
downloadjitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.zip
jitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.tar.gz
jitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.tar.bz2
Update dnsjava to stock 2.1.7 and make sure it is only loaded once
Diffstat (limited to 'src')
-rw-r--r--src/native/windows/run/run.c1
-rw-r--r--src/net/java/sip/communicator/util/util.manifest.mf3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/native/windows/run/run.c b/src/native/windows/run/run.c
index 7f152e9..4bae363 100644
--- a/src/native/windows/run/run.c
+++ b/src/native/windows/run/run.c
@@ -525,6 +525,7 @@ Run_getJavaVMOptionStrings
= {
_T("lib\\felix.jar"),
_T("sc-bundles\\sc-launcher.jar"),
+ _T("sc-bundles\\dnsjava.jar"),
_T("sc-bundles\\util.jar"),
_T("lib"),
NULL
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 7de9af7..a6e4db7 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -56,8 +56,7 @@ Import-Package: com.sun.awt,
sun.awt.shell,
sun.net.dns,
sun.net.util
-Export-Package: org.xbill.DNS,
- net.java.sip.communicator.util,
+Export-Package: net.java.sip.communicator.util,
net.java.sip.communicator.util.launchutils,
net.java.sip.communicator.util.skin,
net.java.sip.communicator.util.xml,