aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2013-06-06 14:26:50 +0300
committerBoris Grozev <boris@jitsi.org>2013-06-06 14:35:40 +0300
commitdd7162993e4f8cb7d5b4be5d916851267c8ca981 (patch)
tree3f71f666b41228177768ec4c1a56d5993924ca63 /src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
parent11252c5350454501b67854af0554c3b299f667cc (diff)
downloadjitsi-dd7162993e4f8cb7d5b4be5d916851267c8ca981.zip
jitsi-dd7162993e4f8cb7d5b4be5d916851267c8ca981.tar.gz
jitsi-dd7162993e4f8cb7d5b4be5d916851267c8ca981.tar.bz2
Don't advertise GTalk audio/video capabilities if calls are disabled (via
the net.java.sip.communicator.impl.protocol.jabber.CALLING_DISABLED property)
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index b1aa32b..59a05a1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -339,7 +339,7 @@ public class OperationSetBasicTelephonyJabberImpl
{
isGingle = false;
}
- else if (protocolProvider.isGTalkTesting() // test GTALK property
+ else if (protocolProvider.isGTalkTesting() // GTalk enabled locally
// see if peer supports Google Talk voice
&& (hasGtalkCaps || alwaysCallGtalk))
{
@@ -515,7 +515,7 @@ public class OperationSetBasicTelephonyJabberImpl
}
}
}
- else if (protocolProvider.isGTalkTesting() // test GTALK property
+ else if (protocolProvider.isGTalkTesting() // GTalk enabled locally
// see if peer supports Google Talk voice
&& (hasGtalkCaps || isAlwaysCallGtalk))
{