--- a/libpurple/protocols/jabber/iq.h Sun Feb 08 04:30:23 2009 +0000 +++ b/libpurple/protocols/jabber/iq.h Sun Feb 08 06:31:18 2009 +0000 @@ -22,10 +22,6 @@ #ifndef _PURPLE_JABBER_IQ_H_ #define _PURPLE_JABBER_IQ_H_ -#include "jabber.h" - -typedef struct _JabberIq JabberIq; - typedef enum { JABBER_IQ_SET, JABBER_IQ_GET, @@ -34,7 +30,13 @@ JABBER_IQ_NONE } JabberIqType; -typedef void (JabberIqHandler)(JabberStream *js, xmlnode *packet); +#include "jabber.h" + +typedef struct _JabberIq JabberIq; + +typedef void (JabberIqHandler)(JabberStream *js, const char *from, + JabberIqType type, const char *id, + xmlnode *child); typedef void (JabberIqCallback)(JabberStream *js, xmlnode *packet, gpointer data);