aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/gui/main/call
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/call')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/ChooseCallAccountPopupMenu.java11
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java3
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java2
4 files changed, 9 insertions, 8 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java b/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
index df54503..5f3f0cd 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
@@ -15,6 +15,7 @@ import javax.swing.*;
import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.main.contactlist.*;
+import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ChooseCallAccountPopupMenu.java b/src/net/java/sip/communicator/impl/gui/main/call/ChooseCallAccountPopupMenu.java
index a2ade87..d5019eb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ChooseCallAccountPopupMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ChooseCallAccountPopupMenu.java
@@ -147,8 +147,9 @@ public class ChooseCallAccountPopupMenu
for (Object o : telephonyObjects)
{
- if (o instanceof UIContactDetail)
- this.addTelephonyContactItem((UIContactDetail) o, opSetClass);
+ if (o instanceof UIContactDetailImpl)
+ this.addTelephonyContactItem(
+ (UIContactDetailImpl) o, opSetClass);
else if (o instanceof ChatTransport)
this.addTelephonyChatTransportItem((ChatTransport) o,
opSetClass);
@@ -225,7 +226,7 @@ public class ChooseCallAccountPopupMenu
* would be performed when an item is selected
*/
private void addTelephonyContactItem(
- final UIContactDetail telephonyContact,
+ final UIContactDetailImpl telephonyContact,
final Class<? extends OperationSet> opSetClass)
{
final ContactMenuItem contactItem
@@ -473,9 +474,9 @@ public class ChooseCallAccountPopupMenu
*/
private static final long serialVersionUID = 0L;
- private final UIContactDetail contact;
+ private final UIContactDetailImpl contact;
- public ContactMenuItem(UIContactDetail contact)
+ public ContactMenuItem(UIContactDetailImpl contact)
{
this.contact = contact;
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 0add775..7242a22 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
@@ -15,7 +15,6 @@ import javax.swing.*;
import javax.swing.text.*;
import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.main.contactlist.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
@@ -503,7 +502,7 @@ public class OneToOneCallPeerPanel
{
if (image == null || image.length <= 0)
{
- TreeContactList.setSourceContactImage(
+ GuiActivator.getContactList().setSourceContactImage(
peerName, photoLabel, 100, 100);
}
else
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
index e97c2f5..81807bc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
@@ -129,7 +129,7 @@ public class ReceivedCallDialog
{
public void run()
{
- TreeContactList
+ GuiActivator.getContactList()
.setSourceContactImage( peer.getAddress(),
callLabel[0],
50, 50);