comparison libpurple/protocols/jabber/jabber.c @ 26190:d6e23439b77c

Change purple_prpl_can_do_media to purple_prpl_get_media_caps. This allows for it to only be called once. From the caps returned you can then tell which media capabilities a buddy has without having to call the function for each different type.

26189:76104100cb87

		return jabber_google_session_initiate(gc->proto_data, who, type);
	else
		return jingle_rtp_initiate_media(gc->proto_data, who, type);
}

gboolean jabber_can_do_media(PurpleConnection *gc, const char *who, 
                             PurpleMediaSessionType type)
{
	JabberStream *js = (JabberStream *) gc->proto_data;
	JabberBuddy *jb;

	if (!js) {
		purple_debug_error("jabber", "jabber_can_do_media: NULL stream\n");
		return FALSE;
	}

	if (!jb) {
		purple_debug_error("jabber", "Could not find buddy\n");
		return FALSE;
	}

	if (!jabber_buddy_has_capability(jb, JINGLE_TRANSPORT_ICEUDP) &&
			!jabber_buddy_has_capability(jb,
			JINGLE_TRANSPORT_RAWUDP) &&
			!jabber_buddy_has_capability(jb, GTALK_CAP)) {
		purple_debug_info("jingle-rtp", "Buddy doesn't support "
				"the same transport types\n");
		return FALSE;
	}

	/* XMPP will only support two-way media, AFAIK... */
	if (type == (PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking audio/video XEP support for %s\n", who);
		return (jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_AUDIO) ||
				jabber_buddy_has_capability(jb, GTALK_CAP)) && 
				jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_VIDEO);
	} else if (type == (PURPLE_MEDIA_AUDIO)) {
		purple_debug_info("jabber", 
				  "Checking audio XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_AUDIO) ||
				jabber_buddy_has_capability(jb, GTALK_CAP);
	} else if (type == (PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking video XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_VIDEO);
	}

	return FALSE;
}

#endif

void jabber_register_commands(void)

26190:d6e23439b77c

		return jabber_google_session_initiate(gc->proto_data, who, type);
	else
		return jingle_rtp_initiate_media(gc->proto_data, who, type);
}

PurpleMediaCaps jabber_get_media_caps(PurpleConnection *gc, const char *who)
{
	JabberStream *js = (JabberStream *) gc->proto_data;
	JabberBuddy *jb;
	PurpleMediaCaps caps = PURPLE_MEDIA_CAPS_NONE;

	if (!js) {
		purple_debug_error("jabber", "jabber_can_do_media: NULL stream\n");
		return FALSE;
	}

	if (!jb) {
		purple_debug_error("jabber", "Could not find buddy\n");
		return FALSE;
	}

	if (jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_AUDIO))
		caps |= PURPLE_MEDIA_CAPS_AUDIO |
				PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION;
	if (jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_VIDEO))
		caps |= PURPLE_MEDIA_CAPS_VIDEO |
				PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION;
	if (caps & PURPLE_MEDIA_CAPS_AUDIO && caps & PURPLE_MEDIA_CAPS_VIDEO)
		caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
	if (caps != PURPLE_MEDIA_CAPS_NONE) {
		if (!jabber_buddy_has_capability(jb,
				JINGLE_TRANSPORT_ICEUDP) &&
				!jabber_buddy_has_capability(jb,
				JINGLE_TRANSPORT_RAWUDP)) {
			purple_debug_info("jingle-rtp", "Buddy doesn't "
					"support the same transport types\n");
			caps = PURPLE_MEDIA_CAPS_NONE;
		} else
			caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
					PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
	}
	if (jabber_buddy_has_capability(jb, GTALK_CAP))
		caps |= PURPLE_MEDIA_CAPS_AUDIO;

	return caps;
}

#endif

void jabber_register_commands(void)