# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1253566683 0
# Node ID b689be519aa63a18b6a0b96e922bc10ef1495686
# Parent  196e4c5b204312f9601823a11d966a7a17e3b040
Always use Google jingle when the other end supports, will have to do this
to take advantage of the relays (since it needs Google compat. ICE params).
The relay address fetching is still unfinished, so calling with this code is
currently broken...

diff -r 196e4c5b2043 -r b689be519aa6 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Mon Aug 31 20:23:51 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Sep 21 20:58:03 2009 +0000
@@ -3033,12 +3033,9 @@
 		jbr = jabber_buddy_find_resource(jb, resource);
 		g_free(resource);
 
-		/*
-		return jabber_google_session_initiate(js, who, type);
-		*/
+		/* 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,
-				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
 				jabber_resource_has_capability(jbr,
 				GOOGLE_VOICE_CAP))
 			return jabber_google_session_initiate(js, who, type);