[Ayttm-commits] CVS: ayttm/modules/aim-oscar aim-oscar.c,1.3,1.4

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/aim-oscar
In directory subversions:/tmp/cvs-serv15316/modules/aim-oscar

Modified Files:
        aim-oscar.c 
Log Message:
changed code almost everywhere.  removed gtk dependencies in some places, 
changed gdk_input_* to eb_input_*, etc... see the ChangeLog.

Index: aim-oscar.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/aim-oscar.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aim-oscar.c 14 Jan 2003 22:17:23 -0000      1.3
+++ aim-oscar.c 16 Jan 2003 09:51:02 -0000      1.4
@@ -240,7 +240,7 @@
 /*the callback to call all callbacks :P */
 
 
-void eb_aim_callback(gpointer data, gint source, GdkInputCondition condition )
+void eb_aim_callback(void *data, int source, eb_input_condition condition )
 {
   eb_local_account * ela = data;
   struct eb_aim_local_account_data * alad =
@@ -283,14 +283,14 @@
       else if (conn->type == AIM_CONN_TYPE_CHATNAV)
       {
        g_warning("CONNECTION ERROR! (ChatNav)");
-       gdk_input_remove(alad->chatnav_input);
+       eb_input_remove(alad->chatnav_input);
        aim_conn_kill(&(alad->aimsess), &conn);
        alad->chatnav_conn = NULL;
       }
       else if (conn->type == AIM_CONN_TYPE_CHAT)
       {
        g_warning("CONNECTION ERROR! (Chat)");
-       gdk_input_remove(alad->chatnav_input);
+       eb_input_remove(alad->chatnav_input);
        aim_conn_kill(&(alad->aimsess), &conn);
        alad->chat_conn = NULL;
        alad->chat_room = NULL;
@@ -474,7 +474,7 @@
         aim_bos_clientready(sess, command->conn); /* tell BOS we're ready to 
go live */
                
 
-               gdk_input_remove(alad->input);
+               eb_input_remove(alad->input);
                while( node )
                {
                        int j =0;
@@ -501,7 +501,7 @@
 
                        //sleep(5);
                }
-               alad->input = gdk_input_add(alad->conn->fd, 
GDK_INPUT_READ|GDK_INPUT_EXCEPTION , eb_aim_callback, account);
+               alad->input = eb_input_add(alad->conn->fd, 
EB_INPUT_READ|EB_INPUT_EXCEPTION , eb_aim_callback, account);
 
 
         /* you should now be ready to go */
@@ -521,8 +521,8 @@
          else
         {
           /* TODO */
-          gdk_input_add(tstconn->fd,
-                        GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
+          eb_input_add(tstconn->fd,
+                        EB_INPUT_READ | EB_INPUT_EXCEPTION,
                         eb_aim_callback, tstconn);
 
           /* Send the cookie to the Auth */
@@ -553,8 +553,8 @@
 
            alad->chatnav_conn = tstconn;
            alad->chatnav_input =
-             gdk_input_add(tstconn->fd,
-                           GDK_INPUT_READ|GDK_INPUT_EXCEPTION,
+             eb_input_add(tstconn->fd,
+                           EB_INPUT_READ|EB_INPUT_EXCEPTION,
                            eb_aim_callback, account);
          }
       }
@@ -591,8 +591,8 @@
            alad->chat_conn = tstconn;
            strcpy(alad->chat_room->id, roomname);
            alad->chat_input =
-             gdk_input_add(tstconn->fd,
-                           GDK_INPUT_READ|GDK_INPUT_EXCEPTION,
+             eb_input_add(tstconn->fd,
+                           EB_INPUT_READ|EB_INPUT_EXCEPTION,
                            eb_aim_callback, account);
 
 #ifdef DEBUG
@@ -955,8 +955,8 @@
   g_message("Closing auth connection...\n");
 #endif
 
-  gdk_input_remove(alad->input);
- // gtk_timeout_remove(alad->timer);
+  eb_input_remove(alad->input);
+ // eb_timeout_remove(alad->timer);
   aim_conn_kill(sess, &(alad->conn));
   do
   {
@@ -982,8 +982,8 @@
    aim_conn_addhandler(sess, alad->conn, AIM_CB_FAM_MSG, 
AIM_CB_MSG_MISSEDCALL, eb_aim_msg_missed, 0);
    aim_conn_addhandler(sess, alad->conn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, 
eb_aim_msg_error, 0);
    aim_conn_addhandler(sess, alad->conn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, 
(rxcallback_t) eb_aim_info_responce, 0);
-  alad->input = gdk_input_add(alad->conn->fd, 
GDK_INPUT_READ|GDK_INPUT_EXCEPTION , eb_aim_callback, ela);
-  //alad->timer = gtk_timeout_add(100, aim_poll_server, sess);
+  alad->input = eb_input_add(alad->conn->fd, EB_INPUT_READ|EB_INPUT_EXCEPTION 
, eb_aim_callback, ela);
+  //alad->timer = eb_timeout_add(100, aim_poll_server, sess);
 
 
        alad->status=AIM_ONLINE;
@@ -1150,8 +1150,8 @@
        aim_conn_addhandler(&(alad->aimsess), alad->conn, AIM_CB_FAM_GEN, 
AIM_CB_GEN_SERVERREADY, eb_aim_serverready, 0 );
 #endif
 
-       alad->input = gdk_input_add(alad->conn->fd, 
GDK_INPUT_READ|GDK_INPUT_EXCEPTION , eb_aim_callback, account);
-//     alad->timer = gtk_timeout_add(100, aim_poll_server, &(alad->aimsess));
+       alad->input = eb_input_add(alad->conn->fd, 
EB_INPUT_READ|EB_INPUT_EXCEPTION , eb_aim_callback, account);
+//     alad->timer = eb_timeout_add(100, aim_poll_server, &(alad->aimsess));
        
 
                                                                  
@@ -1161,8 +1161,8 @@
 {
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)account->protocol_local_account_data;
-       gdk_input_remove(alad->input);
-//     gtk_timeout_remove(alad->timer);
+       eb_input_remove(alad->input);
+//     eb_timeout_remove(alad->timer);
        aim_conn_kill(&(alad->aimsess), &(alad->conn));
        alad->status=AIM_OFFLINE;
        ref_count--;
@@ -1870,7 +1870,7 @@
   g_message("closing CHAT connection: %d", alad->chat_conn->fd);
 #endif
 
-  gdk_input_remove(alad->chat_input);
+  eb_input_remove(alad->chat_input);
   aim_conn_kill(&alad->aimsess, &alad->chat_conn);
   alad->chat_conn = NULL;
   alad->chat_room = NULL;