diff options
author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-02-21 20:23:19 +0000 |
---|---|---|
committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-02-21 20:23:19 +0000 |
commit | ebc08c20750cd3f5401f8d689f0b02d2ecfcfab6 (patch) | |
tree | 425f9f528efbb3d3efbe10bd9db0f8c1dd796bb3 /src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java | |
parent | 9b808b2b7c971518f87d6714c3d44d147904c715 (diff) | |
download | jitsi-ebc08c20750cd3f5401f8d689f0b02d2ecfcfab6.zip jitsi-ebc08c20750cd3f5401f8d689f0b02d2ecfcfab6.tar.gz jitsi-ebc08c20750cd3f5401f8d689f0b02d2ecfcfab6.tar.bz2 |
Fixes issues with video conferences such as adding peers and allowing non-focus peers to start their video first.
Diffstat (limited to 'src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java')
-rw-r--r-- | src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java b/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java index e8b09c3..a4423f5 100644 --- a/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java +++ b/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java @@ -16,7 +16,7 @@ import net.java.sip.communicator.util.*; * order to make it easier for implementers to provide complete solutions while * focusing on protocol-specific details. * - * @author Lubomir Marinov + * @author Lyubomir Marinov */ public abstract class AbstractProtocolProviderService implements ProtocolProviderService @@ -128,11 +128,8 @@ public abstract class AbstractProtocolProviderService if (logger.isDebugEnabled()) logger.debug( - "Dispatching " - + event - + " to " - + listeners.length - + " listeners."); + "Dispatching " + event + " to " + listeners.length + + " listeners."); for (RegistrationStateChangeListener listener : listeners) try @@ -141,7 +138,6 @@ public abstract class AbstractProtocolProviderService } catch (Throwable throwable) { - /* * The registration state has already changed and we're not * using the RegistrationStateChangeListeners to veto the change @@ -153,7 +149,10 @@ public abstract class AbstractProtocolProviderService if (throwable instanceof ThreadDeath) throw (ThreadDeath) throwable; logger.error( - "An error occurred while executing RegistrationStateChangeLister#registrationStateChanged(RegistrationStateChangeEvent) of " + "An error occurred while executing " + + "RegistrationStateChangeListener" + + "#registrationStateChanged" + + "(RegistrationStateChangeEvent) of " + listener, throwable); } @@ -188,9 +187,10 @@ public abstract class AbstractProtocolProviderService */ public String getProtocolDisplayName() { - String displayName = - getAccountID().getAccountPropertyString( - ProtocolProviderFactory.PROTOCOL); + String displayName + = getAccountID().getAccountPropertyString( + ProtocolProviderFactory.PROTOCOL); + return (displayName == null) ? getProtocolName() : displayName; } |