diff options
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/call/CallManager.java | 8 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java index ebe3e8d..6144e00 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java @@ -94,7 +94,13 @@ public class CallManager && evt.getOldValue() .equals(CallState.CALL_INITIALIZATION)) { - addMissedCall(new MissedCall(peerName, callDate)); + // if call was answered elsewhere, don't add it + // to missed calls + if(evt.getCause() == null + || (evt.getCause().getReasonCode() != + CallPeerChangeEvent.NORMAL_CALL_CLEARING)) + addMissedCall(new MissedCall(peerName, callDate)); + evt.getSourceCall().removeCallChangeListener(this); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index 96a4659..84098b8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -16,6 +16,7 @@ import javax.swing.event.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.event.*; +import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chat.menus.*; import net.java.sip.communicator.impl.gui.main.chat.toolBars.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; @@ -1124,7 +1125,11 @@ public class ChatWindow // from the TooltipManager. this.setToolTipText(""); - if (!chatSession.isDescriptorPersistent()) + // if its multichat don't show addContactButton, cause + // it sa mutlichat room which + // cannot be saved with add contact dialog + if (!chatSession.isDescriptorPersistent() + && !(chatSession instanceof ConferenceChatSession)) this.add(addContactButton, 0); else this.remove(addContactButton); |