aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lucas <chenzo@jitsi.org>2012-02-29 10:29:14 +0000
committerVincent Lucas <chenzo@jitsi.org>2012-02-29 10:29:14 +0000
commit1a740bb1f2dbb3aceb18df72f5b1863fd8e41ef2 (patch)
treebf3d13672993173116f6a96235a96ad564013d5a
parent0a0c71237ad7e5d6bfe6277834389b5e4cb2eb6c (diff)
downloadjitsi-1a740bb1f2dbb3aceb18df72f5b1863fd8e41ef2.zip
jitsi-1a740bb1f2dbb3aceb18df72f5b1863fd8e41ef2.tar.gz
jitsi-1a740bb1f2dbb3aceb18df72f5b1863fd8e41ef2.tar.bz2
Closes the CallInfoFrame simultaneously with the CallPanel when the last remote peer leaves the call.
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java14
2 files changed, 13 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index 18ddf86..46cbc1c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -74,6 +74,7 @@ public class CallDialog
{
if (this.callPanel.equals(callPanel))
{
+ this.callPanel.disposeCallInfoFrame();
dispose();
}
}
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 c2889fd..a24d444 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
@@ -546,8 +546,7 @@ public class CallPanel
{
Call call = getCall();
- if (callInfoFrame != null)
- callInfoFrame.dispose();
+ this.disposeCallInfoFrame();
if (call != null)
CallManager.hangupCall(call);
@@ -1591,6 +1590,17 @@ public class CallPanel
}
/**
+ * Disposes the call info frame if it exists.
+ */
+ public void disposeCallInfoFrame()
+ {
+ if (callInfoFrame != null)
+ {
+ callInfoFrame.dispose();
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
public void incomingCallReceived(CallEvent event)