[Ayttm-commits] CVS: ayttm/modules/icq-toc/libtoc libtoc.c,1.3,1.4 libtoc.h,1.2,1.3

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc
In directory subversions:/tmp/cvs-serv10312/modules/icq-toc/libtoc

Modified Files:
        libtoc.c libtoc.h 
Log Message:
avoid namespace collisions


Index: libtoc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc/libtoc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libtoc.c    20 Jan 2003 12:33:44 -0000      1.3
+++ libtoc.c    23 Mar 2003 12:22:43 -0000      1.4
@@ -20,14 +20,21 @@
  */
 
 #include <sys/types.h>
+#ifdef __MINGW32__
+#include <winsock2.h>
+#define O_NONBLOCK 0x4000
+#else
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#endif
 #include <string.h>
[...1241 lines suppressed...]
 
-void toc_callback_handler(void *data, int source, eb_input_condition cond )
+void icqtoc_callback_handler(gpointer data, int source, eb_input_condition 
condition )
 {
-       toc_callback(data);
+       icqtoc_callback(data);
 }
        
 
@@ -1452,8 +1512,8 @@
        char buff[] = "toc_send_im tsearle256 \"if you see this message send a 
message to tsearle256\"";
        proxy_set_proxy( PROXY_NONE, "", 0 );
        conn = toc_signon("", "");
-       toc_im_in = toc_test_im_in;
-       eb_input_add(conn->fd, EB_INPUT_READ, toc_callback_handler, conn);
+       icqtoc_im_in = toc_test_im_in;
+       eb_input_add(conn->fd, EB_INPUT_READ, icqtoc_callback_handler, conn);
 
        gtk_main();
 }

Index: libtoc.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc/libtoc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtoc.h    20 Jan 2003 12:33:44 -0000      1.2
+++ libtoc.h    23 Mar 2003 12:22:43 -0000      1.3
@@ -21,8 +21,8 @@
 #ifndef __LIB_TOC__
 #define __LIB_TOC__
 
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include "llist.h"
 
 typedef struct _toc_conn
 {
@@ -44,49 +44,48 @@
        int  progress;
 } toc_file_conn;
 
-extern void (*toc_new_user)(char * group, char * handle);
-extern int  (*toc_begin_file_recieve)( char * filename, unsigned long size );
-extern void (*toc_update_file_status)( int tag, unsigned long progress );
-extern void (*toc_complete_file_recieve)( int tag );
-extern void (*toc_im_in)(toc_conn  * conn, gchar * user, gchar * message );
-extern void (*toc_chat_im_in)(toc_conn  * conn, gchar * id, gchar * user, 
gchar * message );
-extern void (*update_user_status)(gchar * user, gboolean online, time_t idle, 
gint evil, gboolean unavailable );
-extern void (*toc_error_message)(gchar * message);
-extern void (*toc_disconnect)(toc_conn * conn);
-extern void (*toc_chat_invite)(toc_conn * conn, gchar * id, gchar * name, 
-                     gchar * sender, gchar * message );
-extern void (*toc_join_ack)(toc_conn * conn, gchar * id, gchar * name);
-extern void (*toc_chat_update_buddy)(toc_conn * conn, gchar * id, 
-                                            gchar * user, gboolean online );
-extern void (*toc_file_offer)( toc_conn * conn, char * nick, char * ip, short 
port,
+void (*icqtoc_new_user)(char * group, char * handle);
+void (*icqtoc_new_group)(char * group);
+int  (*icqtoc_begin_file_recieve)( char * filename, unsigned long size );
+void (*icqtoc_update_file_status)( int tag, unsigned long progress );
+void (*icqtoc_complete_file_recieve)( int tag );
+void (*icqtoc_im_in)(toc_conn  * conn, char * user, char * message );
+void (*icqtoc_chat_im_in)(toc_conn  * conn, char * id, char * user, char * 
message );
+void (*icqupdate_user_status)(char * user, int online, time_t idle, int evil, 
int unavailable );
+void (*icqtoc_error_message)(char * message);
+void (*icqtoc_disconnect)(toc_conn * conn);
+void (*icqtoc_chat_invite)(toc_conn * conn, char * id, char * name, 
+                     char * sender, char * message );
+void (*icqtoc_join_ack)(toc_conn * conn, char * id, char * name);
+void (*icqtoc_chat_update_buddy)(toc_conn * conn, char * id, 
+                                            char * user, int online );
+void (*icqtoc_file_offer)( toc_conn * conn, char * nick, char * ip, short port,
                                      char * cookie, char * filename );
 
-extern void (*toc_user_info)(toc_conn  * conn, gchar * user, gchar * message );
+void (*icqtoc_user_info)(toc_conn  * conn, char * user, char * message );
 
-void toc_callback( toc_conn * conn );
-toc_conn * toc_signon( char * username, char * password, 
-               char * server, short port );
-void toc_send_keep_alive( toc_conn * conn );
-void toc_signoff( toc_conn * conn );
-void toc_send_im( toc_conn * conn, gchar * username, gchar * message );
-void toc_get_info( toc_conn * conn, gchar * user );
-void toc_add_buddies( toc_conn * conn, GList * list );
-void toc_add_buddy( toc_conn * conn, gchar * user );
-void toc_set_idle( toc_conn * conn, int idle );
-void toc_set_away( toc_conn * conn, const gchar * message);
-void toc_invite( toc_conn * conn, gchar * id, gchar * buddy, char * message );
-void toc_remove_buddy( toc_conn * conn, gchar * user );
-void toc_chat_join( toc_conn * conn, gchar * chat_room_name );
-void toc_chat_send( toc_conn * conn, gchar * id, gchar * message);
-void toc_chat_leave( toc_conn * conn, gchar * id );
-void toc_chat_accept( toc_conn * conn, gchar * id);
-void toc_file_accept( toc_conn * conn, char * nick, char * ip, short port,
+void icqtoc_callback( toc_conn * conn );
+toc_conn * icqtoc_signon( char * username, char * password,
+               char * server, short port, char * info );
+void icqtoc_send_keep_alive( toc_conn * conn );
+void icqtoc_signoff( toc_conn * conn );
+void icqtoc_send_im( toc_conn * conn, char * username, char * message );
+void icqtoc_get_info( toc_conn * conn, char * user );
+void icqtoc_add_buddies( toc_conn * conn, char * group, LList * list );
+void icqtoc_add_buddy( toc_conn * conn, char * user, char * group );
+void icqtoc_set_idle( toc_conn * conn, int idle );
+void icqtoc_set_away( toc_conn * conn, const char * message);
+void icqtoc_invite( toc_conn * conn, char * id, char * buddy, char * message );
+void icqtoc_chat_join( toc_conn * conn, char * chat_room_name );
+void icqtoc_chat_send( toc_conn * conn, char * id, char * message);
+void icqtoc_chat_leave( toc_conn * conn, char * id );
+void icqtoc_chat_accept( toc_conn * conn, char * id);
+void icqtoc_file_accept( toc_conn * conn, char * nick, char * ip, short port,
                                      char * cookie, char * filename );
-void toc_file_cancel( toc_conn * conn, char * nick, char * cookie );
-void toc_talk_accept( toc_conn * conn, char * nick, char * ip, short port, 
+void icqtoc_file_cancel( toc_conn * conn, char * nick, char * cookie );
+void icqtoc_talk_accept( toc_conn * conn, char * nick, char * ip, short port, 
                                          char * cookie );
-void toc_icq_buddies_pointer(GList * list);
-void toc_set_config( toc_conn * conn, gchar * config );
+void icqtoc_remove_buddy( toc_conn * conn, char * user, char * group );