# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1257794865 0
# Node ID 4b7d599b5a007ee8fb2cb97acd3e97e2e8be02cf
# Parent  0712ce23901ed54fcede5294c0f955002d3ab9f0# Parent  d760797a35289b48456dd749d584b51afad19a6c
merge of '745f55ef98eaf96a452eb54bb2c46f21845f9996'
     and 'b04f4322926ab2a4467fb2b9c11d9961e66d1a9c'

diff -r 0712ce23901e -r 4b7d599b5a00 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Mon Nov 09 19:01:03 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Nov 09 19:27:45 2009 +0000
@@ -3028,10 +3028,12 @@
 
 		/* if we are on a Google Talk connection and the remote supports
 		 Google Jingle, we will go with that */
-		if ((js->googletalk || 
+		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,
-				GOOGLE_VOICE_CAP))
+		    && (((type & PURPLE_MEDIA_AUDIO) && 
+		    	jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP))
+		        || ((type & PURPLE_MEDIA_VIDEO) &&
+		    		jabber_resource_has_capability(jbr, GOOGLE_VIDEO_CAP))))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);