diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-08-09 11:18:52 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-08-09 11:19:36 +0300 |
| commit | 4fda65bcd9d8344acb5e017361d16ae3715291ad (patch) | |
| tree | ec4616f911b88e8a2f14ede0d01e396e8ef4c8a4 /src | |
| parent | a1a3d55572c10d35918f324140b7ecd03f5aa7cf (diff) | |
| download | jitsi-4fda65bcd9d8344acb5e017361d16ae3715291ad.zip jitsi-4fda65bcd9d8344acb5e017361d16ae3715291ad.tar.gz jitsi-4fda65bcd9d8344acb5e017361d16ae3715291ad.tar.bz2 | |
Fixes issue with loading auto answer properties, reported by William Roush.
Diffstat (limited to 'src')
3 files changed, 4 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetAutoAnswerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetAutoAnswerJabberImpl.java index 97b6c42..0ff1f04 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetAutoAnswerJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetAutoAnswerJabberImpl.java @@ -32,6 +32,8 @@ public class OperationSetAutoAnswerJabberImpl ProtocolProviderServiceJabberImpl protocolProvider) { super(protocolProvider); + + this.load(); } /** diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAutoAnswerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAutoAnswerSipImpl.java index 195e4c3..dbc61c6 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAutoAnswerSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAutoAnswerSipImpl.java @@ -74,6 +74,8 @@ public class OperationSetAutoAnswerSipImpl ProtocolProviderServiceSipImpl protocolProvider) { super(protocolProvider); + + this.load(); } /** @@ -329,8 +331,6 @@ public class OperationSetAutoAnswerSipImpl * Makes a check after creating call locally, should we answer it. * * @param call The new incoming call to auto-answer if needed. - * @param isVideoCall Indicates if the remote peer which has created this - * call wish to have a video call. * * @return <tt>true</tt> if we have processed and no further processing is * needed, <tt>false</tt> otherwise. diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java index cd634e7..f8d68d1 100644 --- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java +++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java @@ -52,9 +52,6 @@ public abstract class AbstractOperationSetBasicAutoAnswer ProtocolProviderService protocolProvider) { this.protocolProvider = protocolProvider; - - // init values from account props - load(); } /** |