Mercurial > pidgin3 / file diff

--- 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);