[Ayttm-commits] CVS: ayttm/modules/aim-toc aim-toc.c,1.20,1.21

[Philip S Tellis <address@hidden>]

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

Modified Files:
        aim-toc.c 
Log Message:
make some service args const

Index: aim-toc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/aim-toc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- aim-toc.c   30 Jan 2003 12:15:40 -0000      1.20
+++ aim-toc.c   31 Jan 2003 13:30:41 -0000      1.21
@@ -143,10 +143,10 @@
  
************************************************************************************/
 
 struct eb_aim_account_data {
-               gint status;
+               int status;
         time_t idle_time;
-        gint logged_in_time;
-       gint evil;
+        int logged_in_time;
+       int evil;
 };
 
 struct eb_aim_local_account_data {
@@ -156,7 +156,7 @@
                toc_conn * conn;
                int input;
                int keep_alive;
-               gint status;
+               int status;
 };
 
 enum
@@ -185,7 +185,7 @@
 static input_list * aim_prefs = NULL;
 */
 
-static eb_account * eb_aim_new_account( gchar * account );
+static eb_account * eb_aim_new_account( const char * account );
 static void eb_aim_add_user( eb_account * account );
 static void eb_aim_login( eb_local_account * account );
 static void eb_aim_logout( eb_local_account * account );
@@ -239,7 +239,7 @@
        eb_local_account * account = NULL;
        struct eb_aim_local_account_data * alad;
 
-       gchar buff[256];
+       char buff[256];
        if(IS_ebmProfileData(data))
                account = (eb_local_account*)data->user_data;
        else 
@@ -266,7 +266,7 @@
                g_warning("NULL account associated with AIM connection");
 }
 
-static void eb_aim_join_ack(toc_conn * conn, gchar * id, gchar * name)
+static void eb_aim_join_ack(toc_conn * conn, char * id, char * name)
 {
        eb_chat_room * ecr = find_chat_room_by_name(name, 
SERVICE_INFO.protocol_id);
 
@@ -282,8 +282,8 @@
        eb_join_chat_room(ecr);
 }
 
-static void eb_aim_chat_update_buddy(toc_conn * conn, gchar * id, 
-                                     gchar * user, gboolean online )
+static void eb_aim_chat_update_buddy(toc_conn * conn, char * id, 
+                                     char * user, int online )
 {
        eb_chat_room * ecr = find_chat_room_by_id(id);
        if(!ecr)
@@ -325,7 +325,7 @@
 
 }
 
-static gint eb_aim_keep_alive(gpointer data )
+static int eb_aim_keep_alive(gpointer data )
 {
        struct eb_aim_local_account_data * alad = data;
        toc_conn * conn = alad->conn;
@@ -372,8 +372,8 @@
 }
 
 
-static void eb_aim_chat_invite(toc_conn * conn, gchar * id, gchar * name,
-                               gchar * sender, gchar * message )
+static void eb_aim_chat_invite(toc_conn * conn, char * id, char * name,
+                               char * sender, char * message )
 {
        eb_chat_room * chat_room = g_new0(eb_chat_room, 1);
        eb_local_account * ela = aim_find_local_account_by_conn(conn);
@@ -395,7 +395,7 @@
        do_message_dialog(message, _("AIM Error"), 0);
 }
        
-static void eb_aim_oncoming_buddy(gchar * user, gboolean online, time_t idle, 
gint evil, gboolean unavailable )
+static void eb_aim_oncoming_buddy(char * user, int online, time_t idle, int 
evil, int unavailable )
 {
        eb_account * ea = find_account_by_handle( user, 
SERVICE_INFO.protocol_id);
        struct eb_aim_account_data * aad ;
@@ -435,11 +435,11 @@
 
 /* This is how we deal with incomming chat room messages */
 
-static void eb_aim_toc_chat_im_in( toc_conn * conn, gchar * id, gchar * user, 
gchar * message )
+static void eb_aim_toc_chat_im_in( toc_conn * conn, char * id, char * user, 
char * message )
 {
        eb_chat_room * ecr = find_chat_room_by_id( id );
        eb_account * ea = find_account_by_handle(user, 
SERVICE_INFO.protocol_id);
-       gchar * message2 = linkify(message);
+       char * message2 = linkify(message);
 
        if(!ecr)
        {
@@ -459,7 +459,7 @@
        g_free(message2);
 }
 
-static void eb_aim_user_info(toc_conn * conn, gchar * user, gchar * message )
+static void eb_aim_user_info(toc_conn * conn, char * user, char * message )
 {
        eb_local_account * ela =  aim_find_local_account_by_conn(conn);
        eb_account * sender = NULL;
@@ -542,7 +542,7 @@
 
        
 
-static void eb_aim_parse_incoming_im(toc_conn * conn, gchar * user, gchar * 
message )
+static void eb_aim_parse_incoming_im(toc_conn * conn, char * user, char * 
message )
 {
            //time_t  t = 0;
                eb_local_account * ela = aim_find_local_account_by_conn(conn);
@@ -585,7 +585,7 @@
 
 
 /*   callbacks used by EveryBuddy    */
-static gboolean eb_aim_query_connected(eb_account * account)
+static int eb_aim_query_connected(eb_account * account)
 {              
        struct eb_aim_account_data * aad = account->protocol_account_data;
 
@@ -596,7 +596,7 @@
 
 static void eb_aim_accept_invite( eb_local_account * account, void * 
invitation )
 {
-       gchar * id = invitation;
+       char * id = invitation;
        eb_chat_room * chat_room = find_chat_room_by_id( id );
 
        struct eb_aim_local_account_data * alad = 
@@ -616,11 +616,11 @@
 }
 
 
-static void eb_aim_send_chat_room_message( eb_chat_room * room, gchar * 
message )
+static void eb_aim_send_chat_room_message( eb_chat_room * room, char * message 
)
 {
        struct eb_aim_local_account_data * alad = 
room->chat_room_account->protocol_local_account_data;
        toc_conn * conn = alad->conn;
-       gchar * message2 = linkify(message);
+       char * message2 = linkify(message);
 
        toc_chat_send(conn, room->id, message2 );
        g_free(message2);
@@ -640,7 +640,7 @@
        toc_chat_leave(conn, room->id);
 }
 
-static eb_chat_room * eb_aim_make_chat_room(gchar * name, eb_local_account * 
account )
+static eb_chat_room * eb_aim_make_chat_room(char * name, eb_local_account * 
account )
 {
        eb_chat_room * ecr = g_new0(eb_chat_room, 1);
 
@@ -654,7 +654,7 @@
        return ecr;
 }
 
-static eb_account * eb_aim_new_account( gchar * account )
+static eb_account * eb_aim_new_account( const char * account )
 {
        eb_account * a = g_new0(eb_account, 1);
        struct eb_aim_account_data * aad = g_new0(struct eb_aim_account_data, 
1);
@@ -802,10 +802,10 @@
 
 static void eb_aim_send_im( eb_local_account * account_from,
                                  eb_account * account_to,
-                                 gchar * message )
+                                 char * message )
 {
        struct eb_aim_local_account_data * plad = (struct 
eb_aim_local_account_data*)account_from->protocol_local_account_data;
-       gchar * message2 = linkify(message);
+       char * message2 = linkify(message);
        if(strlen(message2) > 2000)
        {
                do_message_dialog(_("Message Truncated"), _("AIM Error"), 0);
@@ -901,7 +901,7 @@
        return states;
 }
 
-static gint eb_aim_get_current_state(eb_local_account * account )
+static int eb_aim_get_current_state(eb_local_account * account )
 {
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)account->protocol_local_account_data;
@@ -911,7 +911,7 @@
        return alad->status;
 }
 
-static void eb_aim_set_current_state( eb_local_account * account, gint state )
+static void eb_aim_set_current_state( eb_local_account * account, int state )
 {
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)account->protocol_local_account_data;
@@ -953,7 +953,7 @@
 
 }
 
-static void eb_aim_set_away(eb_local_account * account, gchar * message)
+static void eb_aim_set_away(eb_local_account * account, char * message)
 {
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)account->protocol_local_account_data;
@@ -981,9 +981,9 @@
        
 }
 
-static gchar * eb_aim_get_status_string( eb_account * account )
+static char * eb_aim_get_status_string( eb_account * account )
 {
-       static gchar string[255], buf[255];
+       static char string[255], buf[255];
        struct eb_aim_account_data * aad = account->protocol_account_data;
        strcpy(buf, "");
        strcpy(string, "");
@@ -1020,7 +1020,7 @@
        return string;
 }
 
-static void eb_aim_set_idle( eb_local_account * ela, gint idle )
+static void eb_aim_set_idle( eb_local_account * ela, int idle )
 {
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)ela->protocol_local_account_data;
@@ -1028,7 +1028,7 @@
        toc_set_idle( alad->conn, idle );
 }
 
-static void eb_aim_real_change_group(eb_account * ea, char *old_group, char 
*new_group)
+static void eb_aim_real_change_group(eb_account * ea, const char *old_group, 
const char *new_group)
 {
        char str[2048];
        struct eb_aim_local_account_data * alad;
@@ -1045,18 +1045,18 @@
                if( ela && ela->connected && ela->service_id == ea->service_id)
                {
                        alad = ela->protocol_local_account_data;
-                       toc_remove_buddy(alad->conn, ea->handle, old_group);
-                       toc_add_buddy(alad->conn, ea->handle, new_group);
+                       toc_remove_buddy(alad->conn, ea->handle, (char 
*)old_group);
+                       toc_add_buddy(alad->conn, ea->handle, (char 
*)new_group);
                }
        }
 }
 
-static void eb_aim_change_group(eb_account * ea, char *new_group)
+static void eb_aim_change_group(eb_account * ea, const char *new_group)
 {
        eb_aim_real_change_group(ea, ea->account_contact->group->name, 
new_group);
 }
 
-static void eb_aim_del_group(char *group)
+static void eb_aim_del_group(const char *group)
 {
        struct eb_aim_local_account_data * alad;
        LList * node;
@@ -1072,7 +1072,7 @@
        }
 }
        
-static void eb_aim_add_group(char *group)
+static void eb_aim_add_group(const char *group)
 {
        struct eb_aim_local_account_data * alad;
        LList * node;
@@ -1088,7 +1088,7 @@
        }       
 }
 
-static void eb_aim_rename_group(char *old_group, char *new_group)
+static void eb_aim_rename_group(const char *old_group, const char *new_group)
 {
        LList *l;