Mercurial > pidgin
diff libpurple/protocols/jabber/jingle/jingle.h @ 26487:bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 8b60514f2b44295e87ee3587669aec5059556149)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 05 Apr 2009 21:13:10 +0000 |
| parents | 0c8d41f5caa0 |
| children | c585572e80dd |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/jingle.h Sun Apr 05 03:25:00 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.h Sun Apr 05 21:13:10 2009 +0000 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA */ -#ifndef JINGLE_H -#define JINGLE_H +#ifndef PURPLE_JABBER_JINGLE_H +#define PURPLE_JABBER_JINGLE_H #include "jabber.h" @@ -69,7 +69,8 @@ GType jingle_get_type(const gchar *type); -void jingle_parse(JabberStream *js, xmlnode *packet); +void jingle_parse(JabberStream *js, const char *from, JabberIqType type, + const char *id, xmlnode *child); void jingle_terminate_sessions(JabberStream *js); @@ -83,4 +84,4 @@ G_END_DECLS -#endif /* JINGLE_H */ +#endif /* PURPLE_JABBER_JINGLE_H */