comparison libpurple/protocols/jabber/jabber.c @ 26334:6f0200f1e497

Clean up usage of USE_VV in the XMPP protocol.

26333:4143990b5c09

	js->next_id = g_random_int();
	js->write_buffer = purple_circ_buffer_new(512);
	js->old_length = 0;
	js->keepalive_timeout = -1;
	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL);
#ifdef USE_VV
	js->sessions = NULL;
#endif

	js->stun_ip = NULL;
	js->stun_port = 0;
	js->stun_query = NULL;

	if(!js->user) {

void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

#ifdef USE_VV
	/* Close all of the open Jingle sessions on this stream */
	jingle_terminate_sessions(js);
#endif

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.
	 */

gboolean jabber_offline_message(const PurpleBuddy *buddy)
{
	return TRUE;
}
#ifdef USE_VV

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

	if (!js) {
		purple_debug_error("jabber",

			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
			jabber_buddy_has_capability(jb, GTALK_CAP))
		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) {

	}
	if (jabber_buddy_has_capability(jb, GTALK_CAP))
		caps |= PURPLE_MEDIA_CAPS_AUDIO;

	return caps;
}

#endif

void jabber_register_commands(void)
{
	purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,
	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,

26334:6f0200f1e497

	js->next_id = g_random_int();
	js->write_buffer = purple_circ_buffer_new(512);
	js->old_length = 0;
	js->keepalive_timeout = -1;
	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL);
	js->sessions = NULL;
	js->stun_ip = NULL;
	js->stun_port = 0;
	js->stun_query = NULL;

	if(!js->user) {

void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

	/* Close all of the open Jingle sessions on this stream */
	jingle_terminate_sessions(js);

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.
	 */

gboolean jabber_offline_message(const PurpleBuddy *buddy)
{
	return TRUE;
}

PurpleMedia *
jabber_initiate_media(PurpleConnection *gc, const char *who, 
		      PurpleMediaSessionType type)
{
#ifdef USE_VV
	JabberStream *js = (JabberStream *) gc->proto_data;
	JabberBuddy *jb;

	if (!js) {
		purple_debug_error("jabber",

			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
			jabber_buddy_has_capability(jb, GTALK_CAP))
		return jabber_google_session_initiate(gc->proto_data, who, type);
	else
		return jingle_rtp_initiate_media(gc->proto_data, who, type);
#else
	return NULL;
#endif
}

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

	if (!js) {

	}
	if (jabber_buddy_has_capability(jb, GTALK_CAP))
		caps |= PURPLE_MEDIA_CAPS_AUDIO;

	return caps;
#else
	return PURPLE_MEDIA_CAPS_NONE;
#endif
}

void jabber_register_commands(void)
{
	purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,
	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,