comparison libpurple/protocols/jabber/jabber.c @ 30497:bdc353e65a76

Only revert to Google jingle if using a Google account (since that is when relays will be available) or the other party does _not_ support XEP jingle

30496:6fc4df1d12a8

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

30497:bdc353e65a76

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