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

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/aim-toc/libtoc
In directory subversions:/tmp/cvs-serv30500/modules/aim-toc/libtoc

Modified Files:
        libtoc.c libtoc.h 
Log Message:
get_status_pixmap in irc and jabber

Index: libtoc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/libtoc/libtoc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtoc.c    20 Jan 2003 12:33:44 -0000      1.2
+++ libtoc.c    28 Jan 2003 06:20:05 -0000      1.3
@@ -98,18 +98,18 @@
        short len;
 } flap_header;
 
-void (*toc_im_in)(toc_conn  * conn, gchar * user, gchar * message );
-void (*toc_chat_im_in)(toc_conn  * conn, gchar * id, gchar * user, gchar * 
message );
-void (*toc_chat_invite)(toc_conn * conn, gchar * id, gchar * name,
-          gchar * sender, gchar * message );
+void (*toc_im_in)(toc_conn  * conn, char * user, char * message );
+void (*toc_chat_im_in)(toc_conn  * conn, char * id, char * user, char * 
message );
+void (*toc_chat_invite)(toc_conn * conn, char * id, char * name,
+          char * sender, char * message );
 
 void (*toc_new_user)(char * group, char * handle);
-void (*toc_join_ack)(toc_conn * conn, gchar * id, gchar * name);
-void (*update_user_status)(gchar * user, gboolean online, time_t idle, gint 
evil, gboolean unavailable );
-void (*toc_error_message)(gchar * message);
+void (*toc_join_ack)(toc_conn * conn, char * id, char * name);
+void (*update_user_status)(char * user, int online, time_t idle, int evil, int 
unavailable );
+void (*toc_error_message)(char * message);
 void (*toc_disconnect)(toc_conn * conn);
-void (*toc_chat_update_buddy)(toc_conn * conn, gchar * id, 
-               gchar * user, gboolean online );
+void (*toc_chat_update_buddy)(toc_conn * conn, char * id, 
+               char * user, int online );
 
 int  (*toc_begin_file_recieve)( char * filename, unsigned long size );
 void (*toc_update_file_status)( int tag, unsigned long progress );
@@ -118,7 +118,7 @@
                char * cookie, char * filename );
 
 
-void (*toc_user_info)(toc_conn  * conn, gchar * user, gchar * message );
+void (*toc_user_info)(toc_conn  * conn, char * user, char * message );
 
 
 unsigned int get_address(char *hostname)
@@ -223,7 +223,7 @@
 }
 
 //ERROR:<Error Code>:Var args
-char * parse_error(gchar * data)
+char * parse_error(char * data)
 {
        int code;
        static char message[1024];
@@ -381,7 +381,7 @@
 
 
 
-void send_flap( toc_conn * conn, int type, gchar * data )
+void send_flap( toc_conn * conn, int type, char * data )
 {
        char buff[2048];
        int i;
@@ -439,16 +439,16 @@
 }
 
 /*
-   void toc_set_config( toc_conn * conn, gchar * config )
+   void toc_set_config( toc_conn * conn, char * config )
    {
-   gchar buffer[2048];
+   char buffer[2048];
 
    g_snprintf(buffer, 2048, "toc_set_config \"%s\"", config);
    send_flap(conn, DATA, buffer);
    }
    */  
 
-static void toc_get_file_data( gpointer data, gint source, eb_input_condition 
condition )
+static void toc_get_file_data( gpointer data, int source, eb_input_condition 
condition )
 {
 
        char val[1025];
@@ -752,7 +752,7 @@
        int j = 0;
        char * temp;
 //     GList * node;
-//     gchar buddies[2048];
+//     char buddies[2048];
 
 #ifdef DEBUG
        printf( "toc_callback BEFORE %d %d\n", conn->fd, conn->seq_num );
@@ -916,8 +916,8 @@
                 * CHAT_UPDATE_BUDDY:<Chat Room Id>:<Inside? T/F>:<User 
1>:<User 2>...
                 */
 
-               gchar id[255];
-               gboolean inside;
+               char id[255];
+               int inside;
 
                for( j = 0; buff[i] != ':'; j++, i++ )
                {
@@ -931,7 +931,7 @@
 
                while( i < strlen(buff) )
                {
-                       gchar user[255];
+                       char user[255];
                        for( j = 0; buff[i] != ':' && buff[i] != '\0'; j++, i++ 
)
                        {
                                user[j] = buff[i];
@@ -951,9 +951,9 @@
                 * CHAT_IN:<Chat Room Id>:<Source User>:<Whisper? T/F>:<Message>
                 */
 
-               gchar user[255];
-               gchar id[255];
-               gchar message[2048];
+               char user[255];
+               char id[255];
+               char message[2048];
                
                for( j = 0; buff[i] != ':'; j++, i++ )
                {
@@ -981,10 +981,10 @@
                 * CHAT_INVITE:<Chat Room Name>:<Chat Room Id>:<Invite 
Sender>:<Message>
                 */
 
-               gchar name[255];
-               gchar id[255];
-               gchar user[255];
-               gchar message[2048];
+               char name[255];
+               char id[255];
+               char user[255];
+               char message[2048];
 
                for( j = 0; buff[i] != ':'; j++, i++ )
                {
@@ -1208,9 +1208,9 @@
         *     2 byte TLV Tag (1)
         */
 
-       gchar sflap_header[] = {0,0,0,1,0,1};
+       char sflap_header[] = {0,0,0,1,0,1};
 
-       gchar buff[2048];
+       char buff[2048];
 
 
        char * normalized_username = aim_normalize(username);
@@ -1307,18 +1307,18 @@
 #endif
 }
 
-void toc_chat_join( toc_conn * conn, gchar * chat_room_name )
+void toc_chat_join( toc_conn * conn, char * chat_room_name )
 {
-       gchar buff[2048];
+       char buff[2048];
 
        g_snprintf(buff,2048, "toc_chat_join 4 \"%s\"", 
aim_encode(chat_room_name));
 
        send_flap(conn, DATA, buff);
 }
 
-void toc_chat_accept( toc_conn * conn, gchar * id)
+void toc_chat_accept( toc_conn * conn, char * id)
 {
-       gchar buff[2048];
+       char buff[2048];
 
        g_snprintf(buff,2048, "toc_chat_accept %s", id);
 
@@ -1327,23 +1327,23 @@
 
 }
 
-void toc_chat_send( toc_conn * conn, gchar * id, gchar * message)
+void toc_chat_send( toc_conn * conn, char * id, char * message)
 {
-       gchar buff[2048];
+       char buff[2048];
        g_snprintf(buff,2048, "toc_chat_send %s \"%s\"", id, 
aim_encode(message));
        send_flap(conn, DATA, buff);
 }
 
-void toc_chat_leave( toc_conn * conn, gchar * id )
+void toc_chat_leave( toc_conn * conn, char * id )
 {
-       gchar buff[2048];
+       char buff[2048];
        g_snprintf(buff,2048, "toc_chat_leave %s", id);
        send_flap(conn, DATA, buff);
 }
 
-void toc_set_away( toc_conn * conn, const gchar * message)
+void toc_set_away( toc_conn * conn, const char * message)
 {
-       gchar buff[2048];
+       char buff[2048];
     if (message)
                g_snprintf(buff, sizeof(buff), "toc_set_away \"%s\"", message);
        else
@@ -1351,11 +1351,11 @@
        send_flap(conn, DATA, buff);
 }
 
-void toc_send_im( toc_conn * conn, gchar * username, gchar * message )
+void toc_send_im( toc_conn * conn, char * username, char * message )
 {
        /* toc_send_im <Destination User> <Message> [auto] */
 
-       gchar buff[2048];
+       char buff[2048];
 #ifdef DEBUG
        printf( "toc2_send_im BEFORE %d %d\n", conn->fd, conn->seq_num );
 #endif 
@@ -1367,11 +1367,11 @@
 }
 
 
-void toc_add_buddies( toc_conn * conn, gchar * group, GList * list )
+void toc_add_buddies( toc_conn * conn, char * group, LList * list )
 {
-       gchar buff[2001];
-       gchar buff2[2048];
-       GList * node;
+       char buff[2001];
+       char buff2[2048];
+       LList * node;
 
        buff[0] = '\0';
        strcat(buff, "g:");
@@ -1405,30 +1405,30 @@
 
 }
 
-void toc_add_buddy( toc_conn * conn, gchar * user, gchar * group )
+void toc_add_buddy( toc_conn * conn, char * user, char * group )
 {
        /* toc_add_buddy <Buddy User 1> [<Buddy User2> [<Buddy User 3> [...]]] 
*/
-       GList * buddies = NULL;
+       LList * buddies = NULL;
 
-       buddies = g_list_append(buddies, user);
+       buddies = l_list_append(buddies, user);
        toc_add_buddies(conn, group, buddies);
-       g_list_free(buddies);
+       l_list_free(buddies);
 
 }
 
-void toc_get_info( toc_conn * conn, gchar * user )
+void toc_get_info( toc_conn * conn, char * user )
 {
-       gchar buff[2048];
+       char buff[2048];
 
        g_snprintf(buff, 2048, "toc_get_info %s", aim_normalize(user));
        strcpy(user_info_id, user);
        send_flap(conn, DATA, buff);
 }
 
-void toc_remove_buddy( toc_conn * conn, gchar * user, gchar * group )
+void toc_remove_buddy( toc_conn * conn, char * user, char * group )
 {
-       gchar buff[2048];
-       gchar buff2[2048];
+       char buff[2048];
+       char buff2[2048];
 
        strcpy(buff2, aim_normalize(user));
 
@@ -1439,7 +1439,7 @@
 
 void toc_set_idle( toc_conn * conn, int idle )
 {
-       gchar buff[2048];
+       char buff[2048];
 
 #ifdef DEBUG
        printf( "toc_set_idle BEFORE %d %d\n", conn->fd, conn->seq_num );
@@ -1452,13 +1452,13 @@
 
 }
 
-void toc_invite( toc_conn * conn, gchar * id, gchar * buddy, char * message )
+void toc_invite( toc_conn * conn, char * id, char * buddy, char * message )
 {
        /*
         * toc_chat_invite <Chat Room ID> <Invite Msg> <buddy1> [<buddy2> 
[<buddy3> [...]]]
         */
 
-       gchar buff[2048];
+       char buff[2048];
        g_snprintf( buff, 2048, "toc_chat_invite %s \"%s\" %s", id, 
                                aim_encode(message), aim_normalize(buddy) );
        send_flap(conn, DATA, buff );
@@ -1510,14 +1510,14 @@
 
 #if 0
 
-void toc_test_im_in(toc_conn * conn, gchar * user, gchar * message )
+void toc_test_im_in(toc_conn * conn, char * user, char * message )
 {
        char buff[2048];
        g_snprintf(buff,2048, "Hello %s", user );
        toc_send_im(conn, user, buff );
 }
 
-void toc_callback_handler(gpointer data, gint source, eb_input_condition 
condition )
+void toc_callback_handler(gpointer data, int source, eb_input_condition 
condition )
 {
        toc_callback(data);
 }

Index: libtoc.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-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    28 Jan 2003 06:20:05 -0000      1.3
@@ -21,8 +21,8 @@
 #ifndef __LIB_TOC__
 #define __LIB_TOC__
 
-#include <glib.h>
 #include <stdio.h>
+#include "llist.h"
 
 typedef struct _toc_conn
 {
@@ -48,43 +48,43 @@
 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_im_in)(toc_conn  * conn, char * user, char * message );
+extern void (*toc_chat_im_in)(toc_conn  * conn, char * id, char * user, char * 
message );
+extern void (*update_user_status)(char * user, int online, time_t idle, int 
evil, int unavailable );
+extern void (*toc_error_message)(char * 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_chat_invite)(toc_conn * conn, char * id, char * name, 
+                     char * sender, char * message );
+extern void (*toc_join_ack)(toc_conn * conn, char * id, char * name);
+extern void (*toc_chat_update_buddy)(toc_conn * conn, char * id, 
+                                            char * user, int online );
 extern void (*toc_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 );
+extern void (*toc_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, char * info );
 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, gchar * group, GList * list );
-void toc_add_buddy( toc_conn * conn, gchar * user, gchar * group );
+void toc_send_im( toc_conn * conn, char * username, char * message );
+void toc_get_info( toc_conn * conn, char * user );
+void toc_add_buddies( toc_conn * conn, char * group, LList * list );
+void toc_add_buddy( toc_conn * conn, char * user, char * group );
 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_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_set_away( toc_conn * conn, const char * message);
+void toc_invite( toc_conn * conn, char * id, char * buddy, char * message );
+void toc_chat_join( toc_conn * conn, char * chat_room_name );
+void toc_chat_send( toc_conn * conn, char * id, char * message);
+void toc_chat_leave( toc_conn * conn, char * id );
+void toc_chat_accept( toc_conn * conn, char * id);
 void toc_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, 
                                          char * cookie );
-void toc_remove_buddy( toc_conn * conn, gchar * user, gchar * group );
+void toc_remove_buddy( toc_conn * conn, char * user, char * group );