comparison libpurple/protocols/jabber/jabber.c @ 30928:b689be519aa6

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...

30926:196e4c5b2043

		jb = jabber_buddy_find(js, who, FALSE);
		jbr = jabber_buddy_find_resource(jb, resource);
		g_free(resource);

		/*
		return jabber_google_session_initiate(js, who, type);
		*/
		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);
		else
			return jingle_rtp_initiate_media(js, who, type);

30928:b689be519aa6

		jb = jabber_buddy_find(js, who, FALSE);
		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 (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);