aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
diff options
context:
space:
mode:
authoryanas <yana@jitsi.org>2013-05-07 18:44:08 +0200
committeryanas <yana@jitsi.org>2013-05-07 18:44:08 +0200
commitcd5a0b7bc0f29c100e0f724facbad75c6521bffc (patch)
treefb3a4d50cc238bd6f44c87dcdabd3887df3e8e12 /src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
parent7850999c1067defd8c6ab18d059e8d32897fa11a (diff)
downloadjitsi-cd5a0b7bc0f29c100e0f724facbad75c6521bffc.zip
jitsi-cd5a0b7bc0f29c100e0f724facbad75c6521bffc.tar.gz
jitsi-cd5a0b7bc0f29c100e0f724facbad75c6521bffc.tar.bz2
Adds support for draft-saintandre-impp-call-info and improves the avatar
and display name retrieval in outgoing calls and in calls in general.
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
index badbbad..4a9c711 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
@@ -259,7 +259,7 @@ public class OneToOneCallPeerPanel
this.callPeer = callPeer;
this.uiVideoHandler = uiVideoHandler;
- peerName = callPeer.getDisplayName();
+ peerName = CallManager.getPeerDisplayName(callPeer);
securityPanel = SecurityPanel.create(this, callPeer, null);
photoLabel = new JLabel(getPhotoLabelIcon());
@@ -774,6 +774,8 @@ public class OneToOneCallPeerPanel
/**
* Indicates that the security has gone off.
+ *
+ * @param evt the <tt>CallPeerSecurityOffEvent</tt> that notified us
*/
public void securityOff(final CallPeerSecurityOffEvent evt)
{
@@ -1067,6 +1069,8 @@ public class OneToOneCallPeerPanel
*/
public void setPeerImage(byte[] image)
{
+ // If the image is still null we try to obtain it from one of the
+ // available contact sources.
if (image == null || image.length <= 0)
{
GuiActivator.getContactList().setSourceContactImage(