# HG changeset patch
# User Marcus Lundblad <malu@pidgin.im>
# Date 1253568535 0
# Node ID 3cd7ca25c84fb0088cfb95dcfb71fd40a1bff40c
# Parent  284bd8fdc5fa0f3065c3629ac68ced8bd49a96ee
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

diff -r 284bd8fdc5fa -r 3cd7ca25c84f libpurple/protocols/jabber/jabber.c
--- 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