From 6dcf1fe1b3be1bb3dffd8890aa6ee5982ac102da Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Thu, 22 Feb 2007 12:39:27 +0000 Subject: [PATCH] Added multichat operation set definition and Gibberish protocol implementation. Related issues: Issue #241 , Issue #244, Issue #250 Fixed comparison. A status equal to the online threshold is still online. --- .../impl/gui/main/login/LoginManager.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java index 5c6de13e7..4c391f424 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java @@ -156,10 +156,10 @@ public void runLogin(MainFrame parent) .getProtocolProviderLastStatus(protocolProvider); if (status == null - || status.equals(Constants.ONLINE_STATUS) + || status.equals(Constants.ONLINE_STATUS) || ((status instanceof PresenceStatus) - && (((PresenceStatus)status).getStatus() - > PresenceStatus.ONLINE_THRESHOLD))) + && (((PresenceStatus)status).getStatus() + >= PresenceStatus.ONLINE_THRESHOLD))) { this.login(protocolProvider); } @@ -204,10 +204,10 @@ private void showAccountRegistrationWizard() public void registrationStateChanged(RegistrationStateChangeEvent evt) { ProtocolProviderService protocolProvider = evt.getProvider(); - + logger.trace("Protocol provider: " + protocolProvider + " changed its state to: " + evt.getNewState().getStateName()); - + OperationSetPresence presence = mainFrame .getProtocolPresence(protocolProvider); @@ -291,7 +291,7 @@ else if (evt.getNewState().equals(RegistrationState.EXPIRED)) { else if (evt.getNewState().equals(RegistrationState.UNREGISTERED)) { this.mainFrame.getStatusPanel().updateStatus(evt.getProvider()); - + if(mainFrame.getCallManager().containsCallAccount(protocolProvider)) { this.mainFrame.getCallManager() @@ -395,7 +395,7 @@ private void handleProviderAdded(ProtocolProviderService protocolProvider) { logger.trace("The following protocol provider was just added: " + protocolProvider.getAccountID().getAccountAddress()); - + protocolProvider.addRegistrationStateChangeListener(this); this.mainFrame.addProtocolProvider(protocolProvider); @@ -403,10 +403,10 @@ private void handleProviderAdded(ProtocolProviderService protocolProvider) .getProtocolProviderLastStatus(protocolProvider); if (status == null - || status.equals(Constants.ONLINE_STATUS) + || status.equals(Constants.ONLINE_STATUS) || ((status instanceof PresenceStatus) - && (((PresenceStatus)status).getStatus() - > PresenceStatus.ONLINE_THRESHOLD))) + && (((PresenceStatus)status).getStatus() + >= PresenceStatus.ONLINE_THRESHOLD))) { this.login(protocolProvider); }