--- a/mcabber/src/hooks.h	Thu Oct 08 19:40:23 2009 +0200
+++ b/mcabber/src/hooks.h	Sun Oct 11 15:38:32 2009 +0200
@@ -2,7 +2,8 @@
 #define __HOOKS_H__ 1
 
 #include <time.h>
-#include "jabglue.h"
+#include <loudmouth/loudmouth.h>
+#include "xmpp.h"
 
 // These two defines are used by hk_message_{in,out} arguments
 #define ENCRYPTED_PGP   1
@@ -10,13 +11,13 @@
 
 void hk_mainloop(void);
 void hk_message_in(const char *bjid, const char *resname,
-                          time_t timestamp, const char *msg, const char *type,
-                          guint encrypted);
+                   time_t timestamp, const char *msg, LmMessageSubType type,
+                   guint encrypted);
 void hk_message_out(const char *bjid, const char *nickname,
                            time_t timestamp, const char *msg, guint encrypted);
 void hk_statuschange(const char *bjid, const char *resname, gchar prio,
-                            time_t timestamp, enum imstatus status,
-                            char const *status_msg);
+                     time_t timestamp, enum imstatus status,
+                     char const *status_msg);
 void hk_mystatuschange(time_t timestamp,
                               enum imstatus old_status,
                               enum imstatus new_status, const char *msg);