--- a/mcabber/src/roster.h	Tue Dec 06 21:13:03 2005 +0100
+++ b/mcabber/src/roster.h	Fri Dec 09 19:49:58 2005 +0100
@@ -21,6 +21,8 @@
   role_visitor
 };
 
+extern char *strrole[]; // Should match enum above
+
 enum imaffiliation {
   affil_none,
   affil_owner,
@@ -29,6 +31,8 @@
   affil_outcast
 };
 
+extern char *straffil[]; // Should match enum above
+
 enum subscr {
   sub_none,
   sub_to,
@@ -41,6 +45,14 @@
   namesearch
 };
 
+struct role_affil {
+  enum { type_role, type_affil } type;
+  union {
+    enum imrole role;
+    enum imaffiliation affil;
+  } val;
+};
+
 // Roster_type is a set of flags, so values should be 2^n
 #define ROSTER_TYPE_USER    1
 #define ROSTER_TYPE_GROUP   2