Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jingle/jingle.h @ 30961:356a8d472395
propagate from branch 'im.pidgin.pidgin' (head 947bfbeaa5e5a82ae69f2f3d36e34af9c15e24df)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head fedd5136b6592607c51921ec43a7d6fe5741f5a5)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 01 Sep 2010 18:41:53 +0000 |
parents | f858b53dfbf0 |
children | 44f53d3fc54f |
comparison
equal
deleted
inserted
replaced
30911:75460aee9279 | 30961:356a8d472395 |
---|---|
76 void jingle_parse(JabberStream *js, const char *from, JabberIqType type, | 76 void jingle_parse(JabberStream *js, const char *from, JabberIqType type, |
77 const char *id, xmlnode *child); | 77 const char *id, xmlnode *child); |
78 | 78 |
79 void jingle_terminate_sessions(JabberStream *js); | 79 void jingle_terminate_sessions(JabberStream *js); |
80 | 80 |
81 #ifdef USE_VV | |
81 /* create a GParam array given autoconfigured STUN (and later perhaps TURN). | 82 /* create a GParam array given autoconfigured STUN (and later perhaps TURN). |
82 if google_talk is TRUE, set compatability mode to GOOGLE_TALK */ | 83 if google_talk is TRUE, set compatability mode to GOOGLE_TALK */ |
83 GParameter *jingle_get_params(JabberStream *js, guint *num_params); | 84 GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip, |
85 guint relay_udp, guint relay_tcp, guint relay_ssltcp, | |
86 const gchar *relay_username, const gchar *relay_password, guint *num_params); | |
87 #endif | |
84 | 88 |
85 #ifdef __cplusplus | 89 #ifdef __cplusplus |
86 } | 90 } |
87 #endif | 91 #endif |
88 | 92 |