--- a/mcabber/src/jab_priv.h Sat Mar 11 16:37:24 2006 +0100
+++ b/mcabber/src/jab_priv.h Mon Mar 13 17:28:24 2006 +0100
@@ -4,6 +4,7 @@
/* This header file declares functions used by jab*.c only. */
#include "jabglue.h"
+#include "events.h"
#define JABBER_AGENT_GROUP "Jabber Agents"
@@ -27,29 +28,17 @@
#define IQS_CONTEXT_TIMEOUT 1
#define IQS_CONTEXT_ERROR 2
-
-typedef struct {
- char *id;
- time_t ts_create;
- time_t ts_expire;
- guint8 type;
- gpointer data;
- void (*callback)();
- xmlnode xmldata;
-} iqs;
-
-
extern enum enum_jstate jstate;
char *jidtodisp(const char *jid);
void handle_packet_iq(jconn conn, char *type, char *from, xmlnode xmldata);
void display_server_error(xmlnode x);
-iqs *iqs_new(guint8 type, const char *ns, const char *prefix, time_t timeout);
+eviqs *iqs_new(guint8 type, const char *ns, const char *prefix, time_t timeout);
int iqs_del(const char *iqid);
int iqs_callback(const char *iqid, xmlnode xml_result, guint iqcontext);
void iqs_check_timeout(time_t now_t);
-void iqscallback_auth(iqs *iqp, xmlnode xml_result);
+void iqscallback_auth(eviqs *iqp, xmlnode xml_result);
void request_version(const char *fulljid);
void request_time(const char *fulljid);