X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/00ef5271216e3bea9b233ce26a3c0f21fbca931f..79e0a0014d133acab79efd05844d0d4eb534c5d1:/src/chatnav.c

diff --git a/src/chatnav.c b/src/chatnav.c
index f057eae..1c0196c 100644
--- a/src/chatnav.c
+++ b/src/chatnav.c
@@ -16,9 +16,8 @@
 faim_export unsigned long aim_chatnav_reqrights(struct aim_session_t *sess,
 						struct aim_conn_t *conn)
 {
-  aim_genericreq_n(sess, conn, 0x000d, 0x0002);
 
-  return sess->snac_nextid;
+  return aim_genericreq_n_snacid(sess, conn, 0x000d, 0x0002);
 }
 
 faim_export unsigned long aim_chatnav_clientready(struct aim_session_t *sess,
@@ -94,7 +93,7 @@ faim_export unsigned long aim_chatnav_createroom(struct aim_session_t *sess,
 
 static int parseinfo_perms(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen, struct aim_snac_t *snac2)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int ret = 0;
   struct aim_tlvlist_t *tlvlist;
   struct aim_chat_exchangeinfo *exchanges = NULL;
@@ -258,7 +257,7 @@ static int parseinfo_perms(struct aim_session_t *sess, aim_module_t *mod, struct
 
 static int parseinfo_create(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen, struct aim_snac_t *snac2)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist, *innerlist;
   char *ck = NULL, *fqcn = NULL, *name = NULL;
   unsigned short exchange = 0, instance = 0, unknown = 0, flags = 0, maxmsglen = 0, maxoccupancy = 0;