[Ayttm-commits] CVS: ayttm/modules/aim-toc aim-toc.c,1.5,1.6

[Philip S Tellis <address@hidden>]

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

Modified Files:
        aim-toc.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-toc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/aim-toc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aim-toc.c   14 Jan 2003 22:17:23 -0000      1.5
+++ aim-toc.c   16 Jan 2003 09:51:03 -0000      1.6
@@ -46,7 +46,7 @@
 #include "away_window.h"
 #include "util.h"
 #include "status.h"
-#include "globals.h"
+#include "gtk_globals.h"
 #include "dialog.h"
 #include "progress_window.h"
 #include "message_parse.h"
@@ -311,14 +311,14 @@
 
 /*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 )
 {
        struct eb_aim_local_account_data * alad = data;
        toc_conn * conn = alad->conn;
        eb_debug(DBG_TOC, "eb_aim_callback %d %d\n", conn->fd, conn->seq_num);
        if(source < 0 )
        {
-               //gdk_input_remove(*((int*)data));
+               //eb_input_remove(*((int*)data));
                g_assert(0);
        }
        toc_callback(((struct eb_aim_local_account_data *)data)->conn);
@@ -725,9 +725,9 @@
        alad->conn->account = account;
        alad->status = AIM_ONLINE;
        ref_count++;
-       alad->input = gdk_input_add(alad->conn->fd, GDK_INPUT_READ, 
eb_aim_callback, alad);
+       alad->input = eb_input_add(alad->conn->fd, EB_INPUT_READ, 
eb_aim_callback, alad);
                
-       alad->keep_alive = gtk_timeout_add((guint32)60000, eb_aim_keep_alive, 
(gpointer)alad );
+       alad->keep_alive = eb_timeout_add((guint32)60000, eb_aim_keep_alive, 
(gpointer)alad );
 
        is_setting_state = 1;
        
@@ -765,8 +765,8 @@
        struct eb_aim_local_account_data * alad;
        alad = (struct eb_aim_local_account_data 
*)account->protocol_local_account_data;
        eb_debug(DBG_TOC, "eb_aim_logout %d %d\n", alad->conn->fd, 
alad->conn->seq_num );
-       gdk_input_remove(alad->input);
-       gtk_timeout_remove(alad->keep_alive);
+       eb_input_remove(alad->input);
+       eb_timeout_remove(alad->keep_alive);
        if(alad->conn)
        {
                toc_signoff(alad->conn);