aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
commit85901329b0794b136b96bf745f4ab1572806fc89 (patch)
treef23da7e97cae727f39d825f0fef8348cffb238e4 /src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
parent3db2e44f186c59429901b2c899e139ea60117a55 (diff)
parentcf5da997da8820b4050f5b87ee9440a0ede36d1f (diff)
downloadjitsi-master.zip
jitsi-master.tar.gz
jitsi-master.tar.bz2
Merge commit 'cf5da99'HEADmaster
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index 6905df9..7080d13 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -715,14 +715,19 @@ public class MainToolBar
m.put(opSetClass, ct.getProtocolProvider());
UIContactDetailImpl d = new UIContactDetailImpl(
- ct.getName(),
+ ct.getName() + (ct.getResourceName() == null
+ ? ""
+ : "/" + ct.getResourceName()),
ct.getDisplayName(),
null,
- null,
+ (ct.getResourceName() == null
+ ? Arrays.asList(GuiActivator.getResources().getI18NString("service.gui.VIA") + ": "
+ + ct.getProtocolProvider().getAccountID().getAccountAddress())
+ : null),
null,
m,
null,
- ct.getName());
+ ct);
PresenceStatus status = ct.getStatus();
byte[] statusIconBytes = status.getStatusIcon();
@@ -736,7 +741,7 @@ public class MainToolBar
res.add(d);
}
-
+
Point location = new Point(callButton.getX(),
callButton.getY() + callButton.getHeight());