mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Update jingle.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7775 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-29 14:02:41 +00:00
committed by derek
parent 71cb58d0f4
commit 5bc8f28b40
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/commercial/jingle.jar
View File

Binary file not shown.

28
src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JinglePlugin.java
View File

@ -37,14 +37,6 @@ import org.jivesoftware.spark.ui.TranscriptWindow;
import org.jivesoftware.spark.util.SwingWorker; import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log; import org.jivesoftware.spark.util.log.Log;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import javax.swing.text.Style;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyledDocument;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -53,6 +45,14 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import javax.swing.text.Style;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyledDocument;
/** /**
* A simple Jingle Plugin for Spark that uses server Media Proxy for the transport and NAT Traversal * A simple Jingle Plugin for Spark that uses server Media Proxy for the transport and NAT Traversal
@ -175,9 +175,15 @@ public class JinglePlugin implements Plugin, Phone {
Log.error(e); Log.error(e);
} }
// Get the discovered items of the queried XMPP entity if (discoverInfo != null) {
supportsJingle = discoverInfo.containsFeature(JINGLE_NAMESPACE); // Get the discovered items of the queried XMPP entity
jingleFeature.put(jid, supportsJingle); supportsJingle = discoverInfo.containsFeature(JINGLE_NAMESPACE);
jingleFeature.put(jid, supportsJingle);
}
else {
jingleFeature.put(jid, false);
supportsJingle = false;
}
} }
if (!supportsJingle) { if (!supportsJingle) {