Moves CallRenderer and CallPeerRenderer interfaces to service gui. Moves the CallPeerAdapter class to the utility package.

22 files changed, 210 insertions, 59 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index fbb7214..4056d95 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -23,6 +23,7 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.gui.call.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
@@ -1816,7 +1817,7 @@ public class CallPanel
     /**
      * Stops the timer that counts call duration.
      */
-    private void stopCallTimer()
+    public void stopCallTimer()
     {
         this.callDurationTimer.stop();
     }
@@ -1922,7 +1923,7 @@ public class CallPanel
      * only if all call peers are locally or mutually on hold at the same time.
      * In all other cases the hold button is unselected.
      */
-    void updateHoldButtonState()
+    public void updateHoldButtonState()
     {
         if(!SwingUtilities.isEventDispatchThread())
         {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ConferenceCallPeerRenderer.java b/src/net/java/sip/communicator/impl/gui/main/call/ConferenceCallPeerRenderer.java
index f49a496..3150afd 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ConferenceCallPeerRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ConferenceCallPeerRenderer.java
@@ -13,6 +13,6 @@ package net.java.sip.communicator.impl.gui.main.call;
  * @author Lyubomir Marinov
  */
 public interface ConferenceCallPeerRenderer
-    extends CallPeerRenderer
+    extends SwingCallPeerRenderer
 {
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java b/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java
index 1632d94..9868ba8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.service.gui.call.*;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
index ddd4252..d402425 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
@@ -31,7 +31,7 @@ import com.explodingpixels.macwidgets.*;
  */
 public class OneToOneCallPanel
     extends TransparentPanel
-    implements CallRenderer,
+    implements SwingCallRenderer,
                PropertyChangeListener
 {
     /**
@@ -322,7 +322,7 @@ public class OneToOneCallPanel
      * @return the <tt>CallPeerRenderer</tt> corresponding to the given
      * <tt>callPeer</tt>
      */
-    public CallPeerRenderer getCallPeerRenderer(CallPeer callPeer)
+    public SwingCallPeerRenderer getCallPeerRenderer(CallPeer callPeer)
     {
         return this.callPeer.equals(callPeer) ? peerPanel : null;
     }
@@ -424,4 +424,42 @@ public class OneToOneCallPanel
     {
         nameLabel.setText(getPeerDisplayText(callPeer, name));
     }
+
+    /**
+     * Starts the timer that counts call duration.
+     */
+    public void startCallTimer()
+    {
+        callContainer.startCallTimer();
+    }
+
+    /**
+     * Stops the timer that counts call duration.
+     */
+    public void stopCallTimer()
+    {
+        callContainer.stopCallTimer();
+    }
+
+    /**
+     * Returns <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>.
+     *
+     * @return <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>
+     */
+    public boolean isCallTimerStarted()
+    {
+        return callContainer.isCallTimerStarted();
+    }
+
+    /**
+     * Updates the state of the general hold button. The hold button is selected
+     * only if all call peers are locally or mutually on hold at the same time.
+     * In all other cases the hold button is unselected.
+     */
+    public void updateHoldButtonState()
+    {
+        callContainer.updateHoldButtonState();
+    }
 }
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 b4233bb..985c732 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
@@ -17,6 +17,7 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.service.gui.call.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
@@ -25,6 +26,7 @@ import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
 import net.java.sip.communicator.plugin.desktoputil.TransparentPanel;
+import net.java.sip.communicator.util.call.CallPeerAdapter;
 
 import org.jitsi.service.neomedia.*;
 import org.jitsi.service.protocol.event.*;
@@ -42,7 +44,7 @@ import org.jitsi.util.swing.*;
  */
 public class OneToOneCallPeerPanel
     extends TransparentPanel
-    implements CallPeerRenderer,
+    implements SwingCallPeerRenderer,
                PropertyChangeListener,
                Skinnable
 {
@@ -72,7 +74,7 @@ public class OneToOneCallPeerPanel
     /**
      * The renderer of the call.
      */
-    private final CallRenderer callRenderer;
+    private final SwingCallRenderer callRenderer;
 
     /**
      * The component showing the status of the underlying call peer.
@@ -254,7 +256,7 @@ public class OneToOneCallPeerPanel
      * the dealing with the video-related information
      */
     public OneToOneCallPeerPanel(
-            CallRenderer callRenderer,
+            SwingCallRenderer callRenderer,
             CallPeer callPeer,
             UIVideoHandler2 uiVideoHandler)
     {
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 a025e1d..d5326c3 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
@@ -104,7 +104,6 @@ public class ReceivedCallDialog
             // Only one peer.
             else
             {
-
                 textDisplayName = callLabel[1].getText()
                     + getPeerDisplayName(peer)
                     + " "
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
index 11ae4cf..129f9f0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
@@ -65,7 +65,7 @@ public abstract class SecurityPanel<T extends SrtpControl>
      *         unknown or does not have any controls to show.

      */

     public static SecurityPanel<?> create(

-            CallPeerRenderer peerRenderer,

+            SwingCallPeerRenderer peerRenderer,

             CallPeer callPeer,

             SrtpControl srtpControl)

     {

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SwingCallPeerRenderer.java b/src/net/java/sip/communicator/impl/gui/main/call/SwingCallPeerRenderer.java
new file mode 100644
index 0000000..7e7dd00
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SwingCallPeerRenderer.java
@@ -0,0 +1,39 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.gui.main.call;
+
+import java.awt.*;
+
+import net.java.sip.communicator.service.gui.call.*;
+
+/**
+ * The <tt>CallPeerRenderer</tt> interface is meant to be implemented by
+ * different renderers of <tt>CallPeer</tt>s. Through this interface they would
+ * could be updated in order to reflect the current state of the CallPeer.
+ *
+ * @author Yana Stamcheva
+ * @author Lyubomir Marinov
+ */
+public interface SwingCallPeerRenderer
+    extends CallPeerRenderer
+{
+    /**
+     * Returns the parent <tt>CallPanel</tt> containing this renderer.
+     *
+     * @return the parent <tt>CallPanel</tt> containing this renderer
+     */
+    public CallPanel getCallPanel();
+
+    /**
+     * Returns the AWT <tt>Component</tt> which is the user interface equivalent
+     * of this <tt>CallPeerRenderer</tt>.
+     *
+     * @return the AWT <tt>Component</tt> which is the user interface equivalent
+     * of this <tt>CallPeerRenderer</tt>
+     */
+    public Component getComponent();
+}
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SwingCallRenderer.java b/src/net/java/sip/communicator/impl/gui/main/call/SwingCallRenderer.java
new file mode 100644
index 0000000..d43a5cf
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SwingCallRenderer.java
@@ -0,0 +1,28 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.gui.main.call;
+
+import net.java.sip.communicator.service.gui.call.*;
+
+/**
+ * The <tt>CallRenderer</tt> represents a renderer for a call. All user
+ * interfaces representing a call should implement this interface.
+ *
+ * @author Yana Stamcheva
+ */
+public interface SwingCallRenderer
+    extends CallRenderer
+{
+    /**
+     * Returns the parent, container which created this <tt>CallRenderer</tt>
+     * and in which this <tt>CallRenderer</tt> is added
+     *
+     * @return the parent, container which created this <tt>CallRenderer</tt>
+     * and in which this <tt>CallRenderer</tt> is added
+     */
+    public CallPanel getCallContainer();
+}
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
index 9ada2ee..bf14df9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
@@ -121,7 +121,7 @@ public class ZrtpSecurityPanel
     /**
      * The renderer of the corresponding call peer.
      */
-    private final CallPeerRenderer peerRenderer;
+    private final SwingCallPeerRenderer peerRenderer;
 
     /**
      * The security status of the peer
@@ -152,7 +152,7 @@ public class ZrtpSecurityPanel
      * @param zrtpControl the ZRTP security controller that provides information
      *            for this panel and receives the user input
      */
-    public ZrtpSecurityPanel(   CallPeerRenderer peerRenderer,
+    public ZrtpSecurityPanel(   SwingCallPeerRenderer peerRenderer,
                                 CallPeer callPeer,
                                 ZrtpControl zrtpControl)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java
index bf51573..2c3f17e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java
@@ -25,7 +25,7 @@ import net.java.sip.communicator.service.protocol.event.*;
  */
 public abstract class BasicConferenceCallPanel
     extends TransparentPanel
-    implements CallRenderer
+    implements SwingCallRenderer
 {
     /**
      * The <tt>CallPanel</tt> which has created this instance and uses it to
@@ -224,7 +224,7 @@ public abstract class BasicConferenceCallPanel
     /**
      * {@inheritDoc}
      *
-     * Implements {@link CallRenderer#getCallContainer()}.
+     * Implements {@link SwingCallRenderer#getCallContainer()}.
      */
     public CallPanel getCallContainer()
     {
@@ -234,9 +234,9 @@ public abstract class BasicConferenceCallPanel
     /**
      * {@inheritDoc}
      *
-     * Implements {@link CallRenderer#getCallPeerRenderer(CallPeer)}.
+     * Implements {@link SwingCallRenderer#getCallPeerRenderer(CallPeer)}.
      */
-    public CallPeerRenderer getCallPeerRenderer(CallPeer callPeer)
+    public SwingCallPeerRenderer getCallPeerRenderer(CallPeer callPeer)
     {
         return callPeerPanels.get(callPeer);
     }
@@ -542,4 +542,42 @@ public abstract class BasicConferenceCallPanel
             BasicConferenceCallPanel.this.onCallPeerConferenceEvent(ev);
         }
     }
+
+    /**
+     * Starts the timer that counts call duration.
+     */
+    public void startCallTimer()
+    {
+        callPanel.startCallTimer();
+    }
+
+    /**
+     * Stops the timer that counts call duration.
+     */
+    public void stopCallTimer()
+    {
+        callPanel.stopCallTimer();
+    }
+
+    /**
+     * Returns <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>.
+     *
+     * @return <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>
+     */
+    public boolean isCallTimerStarted()
+    {
+        return callPanel.isCallTimerStarted();
+    }
+
+    /**
+     * Updates the state of the general hold button. The hold button is selected
+     * only if all call peers are locally or mutually on hold at the same time.
+     * In all other cases the hold button is unselected.
+     */
+    public void updateHoldButtonState()
+    {
+        callPanel.updateHoldButtonState();
+    }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
index faf1f2f..8ad3f05 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
@@ -59,7 +59,7 @@ public abstract class BasicConferenceParticipantPanel<T>
      * instance and which uses it to depict the associated
      * conference participant.
      */
-    private final CallRenderer callRenderer;
+    private final SwingCallRenderer callRenderer;
 
     /**
      * The status of the peer
@@ -166,7 +166,7 @@ public abstract class BasicConferenceParticipantPanel<T>
      * @param isVideo indicates if we're in a video interface
      */
     public BasicConferenceParticipantPanel(
-            CallRenderer callRenderer,
+            SwingCallRenderer callRenderer,
             T participant,
             boolean isVideo)
     {
@@ -236,7 +236,7 @@ public abstract class BasicConferenceParticipantPanel<T>
      * initialized this instance and which uses it to depict the associated
      * conference participant
      */
-    public CallRenderer getCallRenderer()
+    public SwingCallRenderer getCallRenderer()
     {
         return callRenderer;
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
index 2b93674..324b4e5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
@@ -215,7 +215,7 @@ public class ConferenceFocusPanel
      *
      * @return the parent call renderer
      */
-    public CallRenderer getCallRenderer()
+    public SwingCallRenderer getCallRenderer()
     {
         return callRenderer;
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceMemberPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceMemberPanel.java
index 26df747..c50f24c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceMemberPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceMemberPanel.java
@@ -44,7 +44,7 @@ public class ConferenceMemberPanel
      * @param isVideo indicates if the video conference interface is enabled.
      */
     public ConferenceMemberPanel(
-            CallRenderer callRenderer,
+            SwingCallRenderer callRenderer,
             ConferenceMember member,
             boolean isVideo)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
index 353c5b1..bb25415 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
-import net.java.sip.communicator.impl.gui.main.call.CallPeerAdapter;
 import net.java.sip.communicator.impl.gui.main.presence.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
@@ -23,6 +22,8 @@ import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 
+import net.java.sip.communicator.util.call.CallPeerAdapter;
+
 import org.jitsi.service.neomedia.*;
 import org.jitsi.service.protocol.event.*;
 import org.jitsi.service.resources.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java
index f4228c9..e934c17 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java
@@ -1022,7 +1022,7 @@ public class VideoConferenceCallPanel
             return getCallRenderer().getCallContainer();
         }
 
-        public CallRenderer getCallRenderer()
+        public SwingCallRenderer getCallRenderer()
         {
             return VideoConferenceCallPanel.this;
         }
diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
index 83a8626..1f1d84a 100644
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@@ -31,6 +31,7 @@ Import-Package: com.apple.eawt,
  net.java.sip.communicator.service.filehistory,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
+ net.java.sip.communicator.service.gui.call,
  net.java.sip.communicator.service.history.event,
  net.java.sip.communicator.service.keybindings,
  net.java.sip.communicator.service.metahistory,
@@ -49,6 +50,7 @@ Import-Package: com.apple.eawt,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.skin,
  net.java.sip.communicator.util.account,
+ net.java.sip.communicator.util.call,
  net.java.sip.communicator.plugin.desktoputil,
  net.java.sip.communicator.plugin.desktoputil.border,
  net.java.sip.communicator.plugin.desktoputil.event,
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerRenderer.java b/src/net/java/sip/communicator/service/gui/call/CallPeerRenderer.java
index 6decb79..95648ea 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerRenderer.java
+++ b/src/net/java/sip/communicator/service/gui/call/CallPeerRenderer.java
@@ -4,9 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.main.call;
-
-import java.awt.*;
+package net.java.sip.communicator.service.gui.call;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
@@ -29,13 +27,6 @@ public interface CallPeerRenderer
     public void dispose();
 
     /**
-     * Returns the parent <tt>CallPanel</tt> containing this renderer.
-     *
-     * @return the parent <tt>CallPanel</tt> containing this renderer
-     */
-    public CallPanel getCallPanel();
-
-    /**
      * Returns the parent call renderer.
      *
      * @return the parent call renderer
@@ -43,15 +34,6 @@ public interface CallPeerRenderer
     public CallRenderer getCallRenderer();
 
     /**
-     * Returns the AWT <tt>Component</tt> which is the user interface equivalent
-     * of this <tt>CallPeerRenderer</tt>.
-     *
-     * @return the AWT <tt>Component</tt> which is the user interface equivalent
-     * of this <tt>CallPeerRenderer</tt>
-     */
-    public Component getComponent();
-
-    /**
      * Indicates if the local video component is currently visible.
      *
      * @return <tt>true</tt> if the local video component is currently visible,
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallRenderer.java b/src/net/java/sip/communicator/service/gui/call/CallRenderer.java
index 3147e70..ddc9a3d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallRenderer.java
+++ b/src/net/java/sip/communicator/service/gui/call/CallRenderer.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.main.call;
+package net.java.sip.communicator.service.gui.call;
 
 import net.java.sip.communicator.service.protocol.*;
 
@@ -33,15 +33,6 @@ public interface CallRenderer
     public Call getCall();
 
     /**
-     * Returns the parent, container which created this <tt>CallRenderer</tt>
-     * and in which this <tt>CallRenderer</tt> is added
-     *
-     * @return the parent, container which created this <tt>CallRenderer</tt>
-     * and in which this <tt>CallRenderer</tt> is added
-     */
-    public CallPanel getCallContainer();
-
-    /**
      * Returns the <tt>CallPeerRenderer</tt> corresponding to the given
      * <tt>callPeer</tt>.
      *
@@ -51,4 +42,29 @@ public interface CallRenderer
      * <tt>callPeer</tt>
      */
     public CallPeerRenderer getCallPeerRenderer(CallPeer callPeer);
+
+    /**
+     * Starts the timer that counts call duration.
+     */
+    public void startCallTimer();
+
+    /**
+     * Stops the timer that counts call duration.
+     */
+    public void stopCallTimer();
+
+    /**
+     * Returns <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>.
+     * @return <code>true</code> if the call timer has been started, otherwise
+     * returns <code>false</code>
+     */
+    public boolean isCallTimerStarted();
+
+    /**
+     * Updates the state of the general hold button. The hold button is selected
+     * only if all call peers are locally or mutually on hold at the same time.
+     * In all other cases the hold button is unselected.
+     */
+    public void updateHoldButtonState();
 }
diff --git a/src/net/java/sip/communicator/service/gui/gui.manifest.mf b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
index 1797cf6..7778af2 100644
--- a/src/net/java/sip/communicator/service/gui/gui.manifest.mf
+++ b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
@@ -12,5 +12,6 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.protocol
 Export-Package: net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.gui.call,
  net.java.sip.communicator.service.gui.event,
  net.java.sip.communicator.service.shutdown
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java b/src/net/java/sip/communicator/util/call/CallPeerAdapter.java
index 1fb0696..1aad340 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java
+++ b/src/net/java/sip/communicator/util/call/CallPeerAdapter.java
@@ -4,10 +4,11 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.main.call;
+package net.java.sip.communicator.util.call;
 
 import java.beans.*;
 
+import net.java.sip.communicator.service.gui.call.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 
@@ -109,13 +110,13 @@ public class CallPeerAdapter
         {
             if (!CallPeerState.isOnHold(oldState))
             {
-                if (!renderer.getCallPanel().isCallTimerStarted())
-                    renderer.getCallPanel().startCallTimer();
+                if (!renderer.getCallRenderer().isCallTimerStarted())
+                    renderer.getCallRenderer().startCallTimer();
             }
             else
             {
                 renderer.setOnHold(false);
-                renderer.getCallPanel().updateHoldButtonState();
+                renderer.getCallRenderer().updateHoldButtonState();
             }
         }
         else if (newState == CallPeerState.DISCONNECTED)
@@ -131,7 +132,7 @@ public class CallPeerAdapter
         else if (CallPeerState.isOnHold(newState))
         {
             renderer.setOnHold(true);
-            renderer.getCallPanel().updateHoldButtonState();
+            renderer.getCallRenderer().updateHoldButtonState();
         }
 
         renderer.setPeerState(oldState, newState, newStateString);
@@ -201,4 +202,4 @@ public class CallPeerAdapter
         if (peer.equals(ev.getSource()))
             renderer.securityTimeout(ev);
     }
-}
+}
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 11b391a..f55306f 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -30,6 +30,7 @@ Import-Package: com.sun.awt,
  javax.xml.transform.stream,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.gui.call,
  net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.keybindings,
  net.java.sip.communicator.service.msghistory,
@@ -59,4 +60,5 @@ Export-Package: net.java.sip.communicator.util,
  net.java.sip.communicator.util.launchutils,
  net.java.sip.communicator.util.skin,
  net.java.sip.communicator.util.xml,
- net.java.sip.communicator.util.account
\ No newline at end of file
+ net.java.sip.communicator.util.account,
+ net.java.sip.communicator.util.call
\ No newline at end of file