Mercurial > pidgin.yaz
changeset 30928:b689be519aa6
Always use Google jingle when the other end supports, will have to do this
to take advantage of the relays (since it needs Google compat. ICE params).
The relay address fetching is still unfinished, so calling with this code is
currently broken...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 21 Sep 2009 20:58:03 +0000 |
| parents | 196e4c5b2043 |
| children | 6fc4df1d12a8 |
| files | libpurple/protocols/jabber/jabber.c |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Mon Aug 31 20:23:51 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Sep 21 20:58:03 2009 +0000 @@ -3033,12 +3033,9 @@ jbr = jabber_buddy_find_resource(jb, resource); g_free(resource); - /* - return jabber_google_session_initiate(js, who, type); - */ + /* 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, - JINGLE_APP_RTP_SUPPORT_AUDIO) && jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP)) return jabber_google_session_initiate(js, who, type);