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

1) Update with incoming jingle fix.

Browse Source 
2) Update smack.
3) Update jingle deadloct.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7811 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-29 22:13:14 +00:00
committed by derek
parent fa2c9bc092
commit 1105f251a0
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/lib/dist/smack.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx-debug.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx.jar vendored
View File

Binary file not shown.

BIN
src/commercial/jingle.jar
View File

Binary file not shown.

9
src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/IncomingCallUI.java
View File

@ -159,6 +159,8 @@ public class IncomingCallUI extends JPanel {
return;
}
// Nickname label should show presence and nickname.
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(jid);
String firstName = vcard.getFirstName();
String lastName = vcard.getLastName();
@ -168,11 +170,14 @@ public class IncomingCallUI extends JPanel {
else if (ModelUtil.hasLength(firstName)) {
titleLabel.setText(firstName);
}
else {
titleLabel.setText(nickname);
}
// Nickname label should show presence and nickname.
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(jid);
Icon icon = PresenceManager.getIconFromPresence(PresenceManager.getPresence(jid));
titleLabel.setIcon(icon);