# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1283801293 0
# Node ID 8737d2e4b2977e062b9507ff79309c940b4627fc
# Parent  c954ee77571363fb2e1351951f7dcf680b01be78
restore the Jingle method selection to prefer standard over Google-specific

diff -r c954ee775713 -r 8737d2e4b297 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sun Sep 05 08:54:43 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Sep 06 19:28:13 2010 +0000
@@ -3254,14 +3254,10 @@
 		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);