diff options
author | Yana Stamcheva <yana@jitsi.org> | 2010-12-22 13:07:12 +0000 |
---|---|---|
committer | Yana Stamcheva <yana@jitsi.org> | 2010-12-22 13:07:12 +0000 |
commit | 4e132f0db4530b0cd85923068a1b880400b4cb1c (patch) | |
tree | d12e2977cd693d469992025a3b1ec6c032264332 | |
parent | a23f427f1c22727e9f66470de47a5aa5ebc53e58 (diff) | |
download | jitsi-4e132f0db4530b0cd85923068a1b880400b4cb1c.zip jitsi-4e132f0db4530b0cd85923068a1b880400b4cb1c.tar.gz jitsi-4e132f0db4530b0cd85923068a1b880400b4cb1c.tar.bz2 |
Fix localized call state strings.
4 files changed, 6 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java index a53e3b0..d4da33a 100644 --- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java +++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java @@ -651,7 +651,7 @@ public class CallHistoryServiceImpl .getStartTime().getTime())); callPeerEndTime.append(String.valueOf(item.getEndTime() .getTime())); - callPeerStates.append(item.getState().getStateString()); + callPeerStates.append(item.getState().getLocalizedStateString()); } historyWriter.addRecord(new String[] { diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java index 18362e8..8d5531b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java @@ -66,7 +66,7 @@ public class CallPeerAdapter CallPeerState newState = (CallPeerState) evt.getNewValue(); CallPeerState oldState = (CallPeerState) evt.getOldValue(); - String newStateString = sourcePeer.getState().getStateString(); + String newStateString = sourcePeer.getState().getLocalizedStateString(); // Play the dialing audio when in connecting and initiating call state. // Stop the dialing audio when we enter any other state. @@ -97,8 +97,10 @@ public class CallPeerAdapter // We start the busy sound only if we're in a simple call. if (!renderer.getCallDialog().isConference()) + { NotificationManager.fireNotification( NotificationManager.BUSY_CALL); + } } else if (newState == CallPeerState.CONNECTING_INCOMING_CALL || newState == CallPeerState.CONNECTING_INCOMING_CALL_WITH_MEDIA) 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 8f614e9..40deeaf 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 @@ -330,7 +330,7 @@ public class OneToOneCallPeerPanel // stateLabel callStatusLabel.setForeground(Color.WHITE); dtmfLabel.setForeground(Color.WHITE); - callStatusLabel.setText(callPeer.getState().getStateString()); + callStatusLabel.setText(callPeer.getState().getLocalizedStateString()); PeerStatusPanel statusPanel = new PeerStatusPanel(new GridBagLayout()); 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 c749a56..a1c60f1 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 @@ -364,7 +364,7 @@ public class ConferencePeerPanel */ private void initStatusBar(CallPeer callPeer) { - this.setParticipantState(callPeer.getState().getStateString()); + this.setParticipantState(callPeer.getState().getLocalizedStateString()); this.addToStatusBar(securityStatusLabel); this.addToStatusBar(holdStatusLabel); |