changeset 30497:bdc353e65a76

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
author Marcus Lundblad <ml@update.uu.se>
date Mon, 21 Sep 2009 21:28:55 +0000
parents 6fc4df1d12a8
children 794001c22306
files libpurple/protocols/jabber/jabber.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Mon Sep 21 20:58:12 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Sep 21 21:28:55 2009 +0000
@@ -3035,8 +3035,9 @@
 
 		/* 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