--- a/mcabber/src/jabglue.h	Sat Dec 03 14:25:34 2005 +0100
+++ b/mcabber/src/jabglue.h	Sat Dec 03 23:40:40 2005 +0100
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 
+#include "roster.h"
 #include "../libjabber/jabber.h"
 
 #if HAVE_CONFIG_H
@@ -18,17 +19,6 @@
 extern char imstatus2char[];
 // Status chars: '_', 'o', 'i', 'f', 'd', 'n', 'a'
 
-enum imstatus {
-    offline,
-    available,
-    invisible,
-    freeforchat,
-    dontdisturb,
-    notavail,
-    away,
-    imstatus_size
-};
-
 enum agtype {
     unknown,
     groupchat,
@@ -58,7 +48,7 @@
 void jb_room_join(const char *room, const char *nickname);
 void jb_room_unlock(const char *room);
 void jb_room_invite(const char *room, const char *jid, const char *reason);
-int  jb_room_kickban(const char *roomid, const char *jid, const char *nick,
-                     int kickban, const char *reason);
+int  jb_room_setaffil(const char *roomid, const char *jid, const char *nick,
+                      enum imaffiliation, const char *reason);
 
 #endif /* __JABGLUE_H__ */