Mercurial > pidgin
comparison libpurple/protocols/jabber/jingle/jingle.h @ 26472:3c684403ea10
Fix merge for ./jingle/
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 03 Apr 2009 17:36:24 +0000 |
parents | 26cf297796a5 |
children | 0c8d41f5caa0 |
comparison
equal
deleted
inserted
replaced
26471:91583903b478 | 26472:3c684403ea10 |
---|---|
67 const gchar *jingle_get_action_name(JingleActionType action); | 67 const gchar *jingle_get_action_name(JingleActionType action); |
68 JingleActionType jingle_get_action_type(const gchar *action); | 68 JingleActionType jingle_get_action_type(const gchar *action); |
69 | 69 |
70 GType jingle_get_type(const gchar *type); | 70 GType jingle_get_type(const gchar *type); |
71 | 71 |
72 void jingle_parse(JabberStream *js, xmlnode *packet); | 72 void jingle_parse(JabberStream *js, const char *from, JabberIqType type, |
73 const char *id, xmlnode *child); | |
73 | 74 |
74 void jingle_terminate_sessions(JabberStream *js); | 75 void jingle_terminate_sessions(JabberStream *js); |
75 | 76 |
76 /* create a GParam array given autoconfigured STUN (and later perhaps TURN). | 77 /* create a GParam array given autoconfigured STUN (and later perhaps TURN). |
77 if google_talk is TRUE, set compatability mode to GOOGLE_TALK */ | 78 if google_talk is TRUE, set compatability mode to GOOGLE_TALK */ |