diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2009-09-21 21:28:55 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2009-09-21 21:28:55 +0000 |
| commit | 33710d8d2edd206962b35f14bb8e170ba8f7393e (patch) | |
| tree | d1b73e2275e29b787efb614802215d6dbe63a1f3 | |
| parent | 11524147c8549a0171a5043ee211a672120103b8 (diff) | |
| download | pidgin-33710d8d2edd206962b35f14bb8e170ba8f7393e.tar.gz | |
Only revert to Google jingle if using a Google account (since that is when
relays will be available) or the other party does _not_ support XEP jingle
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index 90c4d03b73..ab1eda1fe9 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -3035,8 +3035,9 @@ jabber_initiate_media(PurpleAccount *account, const char *who, /* if we are on a Google Talk connection and the remote supports Google Jingle, we will go with that */ - if (type & PURPLE_MEDIA_AUDIO && - jabber_resource_has_capability(jbr, + if ((js->googletalk || + !jabber_resource_has_capability(jbr, JINGLE_APP_RTP_SUPPORT_AUDIO)) + && type & PURPLE_MEDIA_AUDIO && jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP)) return jabber_google_session_initiate(js, who, type); else |