Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 26334:6f0200f1e497
Clean up usage of USE_VV in the XMPP protocol.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sat, 21 Mar 2009 09:07:06 +0000 |
parents | 38238d41923b |
children | d06236d07c9e |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sat Mar 21 07:53:22 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Mar 21 09:07:06 2009 +0000 @@ -738,10 +738,7 @@ 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; @@ -1340,10 +1337,8 @@ { 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 @@ -2623,12 +2618,12 @@ { return TRUE; } -#ifdef USE_VV PurpleMedia * jabber_initiate_media(PurpleConnection *gc, const char *who, PurpleMediaSessionType type) { +#ifdef USE_VV JabberStream *js = (JabberStream *) gc->proto_data; JabberBuddy *jb; @@ -2652,10 +2647,14 @@ 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; @@ -2696,10 +2695,11 @@ caps |= PURPLE_MEDIA_CAPS_AUDIO; return caps; +#else + return PURPLE_MEDIA_CAPS_NONE; +#endif } -#endif - void jabber_register_commands(void) { purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,