comparison libpurple/protocols/jabber/jabber.c @ 30511:4b7d599b5a00

merge of '745f55ef98eaf96a452eb54bb2c46f21845f9996' and 'b04f4322926ab2a4467fb2b9c11d9961e66d1a9c'

30509:0712ce23901e

		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 || 
		     !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
			return jingle_rtp_initiate_media(js, who, type);
	}

30511:4b7d599b5a00

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