libpurple/protocols/jabber/jabber.c

branch
cpw.malu.xmpp.google_relay
changeset 28565
3cd7ca25c84f
parent 28564
284bd8fdc5fa
child 28570
3f2c959e511c
--- 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

mercurial