--- a/mcabber/mcabber/compl.h	Wed Nov 10 13:59:48 2010 +0100
+++ b/mcabber/mcabber/compl.h	Wed Nov 10 14:08:24 2010 +0100
@@ -5,37 +5,37 @@
 
 #include <mcabber/config.h>
 
-#define COMPL_CMD         (1U<<0)
-#define COMPL_JID         (1U<<1)
-#define COMPL_URLJID      (1U<<2)   // Not implemented yet
-#define COMPL_NAME        (1U<<3)   // Not implemented yet
-#define COMPL_STATUS      (1U<<4)
-#define COMPL_FILENAME    (1U<<5)   // Not implemented yet
-#define COMPL_ROSTER      (1U<<6)
-#define COMPL_BUFFER      (1U<<7)
-#define COMPL_GROUP       (1U<<8)
-#define COMPL_GROUPNAME   (1U<<9)
-#define COMPL_MULTILINE   (1U<<10)
-#define COMPL_ROOM        (1U<<11)
-#define COMPL_RESOURCE    (1U<<12)
-#define COMPL_AUTH        (1U<<13)
-#define COMPL_REQUEST     (1U<<14)
-#define COMPL_EVENTS      (1U<<15)
-#define COMPL_EVENTSID    (1U<<16)
-#define COMPL_PGP         (1U<<17)
-#define COMPL_COLOR       (1U<<18)
-#define COMPL_OTR         (1U<<19)
-#define COMPL_OTRPOLICY   (1U<<20)
+#define COMPL_CMD         1
+#define COMPL_JID         2
+#define COMPL_URLJID      3   // Not implemented yet
+#define COMPL_NAME        4   // Not implemented yet
+#define COMPL_STATUS      5
+#define COMPL_FILENAME    6   // Not implemented yet
+#define COMPL_ROSTER      7
+#define COMPL_BUFFER      8
+#define COMPL_GROUP       9
+#define COMPL_GROUPNAME   10
+#define COMPL_MULTILINE   11
+#define COMPL_ROOM        12
+#define COMPL_RESOURCE    13
+#define COMPL_AUTH        14
+#define COMPL_REQUEST     15
+#define COMPL_EVENTS      16
+#define COMPL_EVENTSID    17
+#define COMPL_PGP         18
+#define COMPL_COLOR       19
+#define COMPL_OTR         20
+#define COMPL_OTRPOLICY   21
+
 #ifdef MODULES_ENABLE
-#define COMPL_MAX_BUILTIN (1U<<20)
-
-guint compl_new_category (void);
-void  compl_del_category (guint id);
+void  compl_init_system(void);
+guint compl_new_category(void);
+void  compl_del_category(guint id);
 #endif
 
-void    compl_add_category_word(guint, const gchar *command);
+void    compl_add_category_word(guint categ, const gchar *command);
 void    compl_del_category_word(guint categ, const gchar *word);
-GSList *compl_get_category_list(guint cat_flags, guint *dynlist);
+GSList *compl_get_category_list(guint categ, guint *dynlist);
 
 guint   new_completion(const gchar *prefix, GSList *compl_cat,
                        const gchar *suffix);