cpw.malu.xmpp.google_relay: 7b7453a9: restore the Jingle method selection to p...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 7b7453a9fedc85e52c5b238bb50d1d31d32ee7d0
Parent:   02c8fd917f8c417a463e669f08b7378bed23b624
Author:   malu at pidgin.im
Date:     09/06/10 15:28:13
Branch:   im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/7b7453a9fedc85e52c5b238bb50d1d31d32ee7d0

Changelog: 

restore the Jingle method selection to prefer standard over Google-specific

Changes against parent 02c8fd917f8c417a463e669f08b7378bed23b624

  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	c96d34d016931411843724c1753b5572d04d5cb7
+++ libpurple/protocols/jabber/jabber.c	f4de9f9146812cca9194ceff2eeb1fa53ff63c8a
@@ -3254,14 +3254,10 @@ jabber_initiate_media(PurpleAccount *acc
 		jbr = jabber_buddy_find_resource(jb, resource);
 		g_free(resource);
 
-		/* if we are on a Google Talk connection and the remote supports
-		 Google Jingle, we will go with that */
-		if (((js->googletalk && js->google_relay_token) ||
-		     !jabber_resource_has_capability(jbr, JINGLE_APP_RTP_SUPPORT_AUDIO))
-		    && (((type & PURPLE_MEDIA_AUDIO) && 
-		    	jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
-		        || ((type & PURPLE_MEDIA_VIDEO) &&
-		    		jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))))
+		if (type & PURPLE_MEDIA_AUDIO &&
+			!jabber_resource_has_capability(jbr,
+			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);