[Ayttm-commits] CVS: ayttm/modules/icq icq.c,1.13,1.14

[Philip S Tellis <address@hidden>]

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

Modified Files:
        icq.c 
Log Message:
make some service args const

Index: icq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/icq.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icq.c       30 Jan 2003 08:23:19 -0000      1.13
+++ icq.c       31 Jan 2003 13:30:41 -0000      1.14
@@ -147,7 +147,7 @@
 
 /*this is an evil hack to deal with the single user nature of libICQ*/
 static eb_local_account * icq_user_account = NULL;
-static gchar* ICQ_STATUS_STRINGS[] = {"", "(Away)", "(N/A)", "(Occ)", "(DND)", 
"(Offline)", "(Invis)", "(Chat)"};
+static char* ICQ_STATUS_STRINGS[] = {"", "(Away)", "(N/A)", "(Occ)", "(DND)", 
"(Offline)", "(Invis)", "(Chat)"};
 
 static LList * icq_buddies = NULL;
 
@@ -175,7 +175,7 @@
 {
     USER_EXT_INFO * ext_info;
     USER_INFO_PTR user_info;
-    gchar *away;
+    char *away;
 } icq_info_data;
 
 
@@ -319,12 +319,12 @@
 
 typedef struct icq_local_account_data
 {
-    gchar password[1024];
-    gint timeout_id;
-    gint select_id;
+    char password[1024];
+    int timeout_id;
+    int select_id;
 } icq_local_account;
 
-static gint connection = STATUS_OFFLINE;
+static int connection = STATUS_OFFLINE;
 
 
 static CONTACT_PTR getContact( glong uin )
@@ -338,10 +338,10 @@
        return 0;
 }
 
-static gint icq_get_current_state(eb_local_account * account );
+static int icq_get_current_state(eb_local_account * account );
 static void icq_logout( eb_local_account * account );
 static void icq_login( eb_local_account * account );
-static eb_chat_room * icq_make_chat_room( gchar * name, eb_local_account * 
account );
+static eb_chat_room * icq_make_chat_room( char * name, eb_local_account * 
account );
 static void icq_info_update(eb_account *sender); 
 static void icq_info_data_cleanup(info_window *iw);
 static void icq_get_info( eb_local_account * account_from, eb_account * 
account_to);
@@ -600,8 +600,8 @@
 
 static void EventMessage(void*data)
 {
-       gchar buff[255];
-       gchar message[1024];
+       char buff[255];
+       char message[1024];
        eb_account * sender=NULL;
        CLIENT_MESSAGE_PTR c_messg;
        
@@ -713,15 +713,15 @@
 {
        USER_UPDATE_PTR user_update;
        eb_account * ea;
-       gchar buff[255];
+       char buff[255];
        user_update = (USER_UPDATE_PTR)data;
 
        if(!user_update)
        {
                return;
        }
-       if((gint)data == SRV_GO_AWAY || (gint)data == SRV_FORCE_DISCONNECT
-           || (gint)data == SRV_MULTI_PACKET )
+       if((int)data == SRV_GO_AWAY || (int)data == SRV_FORCE_DISCONNECT
+           || (int)data == SRV_MULTI_PACKET )
        {
                icq_logout(icq_user_account);
                fprintf (stderr, "ICQ has terminated this connection.  "
@@ -730,7 +730,7 @@
                /* icq_login(icq_user_account); */
                return;
        }
-       if((gint)data == SRV_BAD_PASS || (gint)data == SRV_WHAT_THE_HELL)
+       if((int)data == SRV_BAD_PASS || (int)data == SRV_WHAT_THE_HELL)
        {
                icq_logout(icq_user_account);
                return;
@@ -763,7 +763,7 @@
 
 static void EventInfo(void*data)
 {
-       gchar buff[255];
+       char buff[255];
         USER_INFO_PTR ui = data;
        eb_local_account * ela;
        eb_account * ea;
@@ -823,7 +823,7 @@
 {
 
         USER_EXT_INFO_PTR ui = data;
-        gchar buff[255];
+        char buff[255];
         eb_local_account * ela;
         eb_account * ea;
         g_snprintf(buff,255, "%d", ui->uin);
@@ -878,14 +878,14 @@
 
 /* here are the timers that will maintain the ICQ connection and poll for 
events*/
 
-static gint SelectServer(gpointer data)
+static int SelectServer(gpointer data)
 {
   ICQ_Check_Response(10000);
   return TRUE;
 }
 
 
-static gint KeepAlive(gpointer data)
+static int KeepAlive(gpointer data)
 {
        if(connection==STATUS_ONLINE)
                ICQ_Keep_Alive();
@@ -926,7 +926,7 @@
 }
        
        
-static gboolean icq_query_connected (eb_account * account)
+static int icq_query_connected (eb_account * account)
 {
        CONTACT_PTR contact = getContact(atol(account->handle));
        struct icq_account_data * iad = account->protocol_account_data;
@@ -960,7 +960,7 @@
        }
 }
 
-static eb_account * icq_new_account( gchar * account )
+static eb_account * icq_new_account( const char * account )
 {
        eb_account * a = g_new0(eb_account, 1);
        struct icq_account_data * iad = g_new(struct icq_account_data, 1);
@@ -1104,7 +1104,7 @@
 
 static void icq_send_im( eb_local_account * account_from,
                                  eb_account * account_to,
-                                 gchar *message )
+                                 char *message )
 {
        CONTACT_PTR contact = getContact(atol(account_to->handle));
        struct icq_account_data * iad = account_to->protocol_account_data;
@@ -1142,7 +1142,7 @@
        return states;
 }
 
-static gint icq_get_current_state(eb_local_account * account )
+static int icq_get_current_state(eb_local_account * account )
 {
        assert( eb_services[account->service_id].protocol_id  == 
SERVICE_INFO.protocol_id );
        switch(set_status)
@@ -1170,7 +1170,7 @@
        }
 }
 
-static void icq_set_current_state(eb_local_account * account, gint state )
+static void icq_set_current_state(eb_local_account * account, int state )
 {
        assert( eb_services[account->service_id].protocol_id  == 
SERVICE_INFO.protocol_id );
        switch(state)
@@ -1258,7 +1258,7 @@
        }
 }
 
-static gchar * icq_get_status_string( eb_account * account )
+static char * icq_get_status_string( eb_account * account )
 {
 
        struct icq_account_data * iad = account->protocol_account_data;
@@ -1298,7 +1298,7 @@
        }
 }
 
-static void icq_set_idle(eb_local_account * account, gint idle )
+static void icq_set_idle(eb_local_account * account, int idle )
 {
        if((idle == 0) && icq_get_current_state(account) == ICQ_AWAY )
        {
@@ -1340,7 +1340,7 @@
        ICQ_Request_Chat(uin, message);
 }
 
-static eb_chat_room * icq_make_chat_room( gchar * name, eb_local_account * 
account )
+static eb_chat_room * icq_make_chat_room( char * name, eb_local_account * 
account )
 {
        eb_chat_room * ecr = find_chat_room_by_id("ICQ");
        
@@ -1403,7 +1403,7 @@
        ICQ_Refuse_Chat(uin);
 }
 
-static void icq_set_away( eb_local_account * account, gchar * message)
+static void icq_set_away( eb_local_account * account, char * message)
 {
        if (message)
        {
@@ -1439,7 +1439,7 @@
 }
 
 static void icq_info_update(eb_account *sender) {
-     gchar buff[255];
+     char buff[255];
      info_window *iw = sender->infowindow;
      
      icq_info_data * iid = (icq_info_data *)iw->info_data;