cpw.malu.xmpp.google_relay: 050563c1: Only revert to Google jingle if using a ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 050563c1a01ad0bb3914f5c53e7efd2f47d79f29
Ancestor: 05677ff34778cb32fb4c7e9386d6364cab4c58b9
Author: malu at pidgin.im
Date: 2009-09-21T21:28:55
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/050563c1a01ad0bb3914f5c53e7efd2f47d79f29

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	0fa161f86833c6cce5ef6216b5bdf8fca2d38bfb
+++ libpurple/protocols/jabber/jabber.c	daa54ce6873c4a45b31ac5ab04b73c7cc4d295a8
@@ -3035,8 +3035,9 @@ jabber_initiate_media(PurpleAccount *acc
 
 		/* 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