comparison libpurple/protocols/jabber/jabber.c @ 30536:8737d2e4b297

restore the Jingle method selection to prefer standard over Google-specific

30535:c954ee775713

		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 (((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, NS_GOOGLE_VOICE))
		        || ((type & PURPLE_MEDIA_VIDEO) &&
		    		jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))))
			return jabber_google_session_initiate(js, who, type);
		else
			return jingle_rtp_initiate_media(js, who, type);
	}

30536:8737d2e4b297

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

		if (type & PURPLE_MEDIA_AUDIO &&
			!jabber_resource_has_capability(jbr,
			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
			return jabber_google_session_initiate(js, who, type);
		else
			return jingle_rtp_initiate_media(js, who, type);
	}