[Ayttm-commits] CVS: ayttm/modules/aim-toc aim-toc.c,1.14,1.15

[Colin Leroy <address@hidden>]

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

Modified Files:
        aim-toc.c 
Log Message:
get rid of gtk deps


Index: aim-toc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/aim-toc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aim-toc.c   27 Jan 2003 17:12:59 -0000      1.14
+++ aim-toc.c   27 Jan 2003 17:32:15 -0000      1.15
@@ -46,16 +46,14 @@
 #include "away_window.h"
 #include "util.h"
 #include "status.h"
-#include "gtk_globals.h"
 #include "dialog.h"
 #include "progress_window.h"
 #include "message_parse.h"
 #include "value_pair.h"
 #include "info_window.h"
-#include "gtk_eb_html.h"
 #include "plugin_api.h"
 #include "smileys.h"
-
+#include "globals.h"
 #include "pixmaps/aim_online.xpm"
 #include "pixmaps/aim_away.xpm"
 
@@ -189,7 +187,7 @@
 static void eb_aim_login( eb_local_account * account );
 static void eb_aim_logout( eb_local_account * account );
 static void aim_info_data_cleanup(info_window * iw);
-static void aim_info_update(info_window * iw);
+static void aim_info_update(eb_account *sender);
 
 
 /*********
@@ -333,9 +331,9 @@
        return TRUE;
 }
 
-static void eb_aim_process_file_request( GtkWidget * widget, gpointer data )
+static void eb_aim_process_file_request( gpointer data, int result )
 {
-       int accepted = (int)gtk_object_get_user_data(GTK_OBJECT(widget));
+       int accepted = result;
        eb_aim_file_request * eafr = data;
 
        if(accepted)
@@ -366,7 +364,7 @@
 
        g_snprintf( message, 1024, _("AIM user %s would like to\nsend you the 
file\n%s\ndo you want to accept?"), nick, filename );
 
-       do_dialog( message, _("Incomming AIM File Request"), 
eb_aim_process_file_request, eafr );
+       eb_do_dialog( message, _("Incoming AIM File Request"), 
eb_aim_process_file_request, eafr );
 
 }
 
@@ -483,12 +481,11 @@
        if(sender->infowindow == NULL )
        {
                sender->infowindow = eb_info_window_new(reciever, sender);
-               gtk_widget_show(sender->infowindow->window);
        }
 
        sender->infowindow->info_data = strdup(message);
        sender->infowindow->cleanup = aim_info_data_cleanup;
-       aim_info_update(sender->infowindow);
+       aim_info_update(sender);
 }
 
 static void eb_aim_new_user(char * group, char * handle)
@@ -1030,12 +1027,12 @@
        toc_get_info( alad->conn, account_to->handle );
 }
 
-static void aim_info_update(info_window * iw)
+static void aim_info_update(eb_account *sender)
 {
+       info_window *iw = sender->infowindow;
        char * data = (char *)iw->info_data;
        eb_info_window_clear(iw);
-       gtk_eb_html_add(EXT_GTK_TEXT(iw->info), data,1,1,0);
-       
gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(iw->scrollwindow)),0);
+       eb_info_window_add_info(sender, data,1,1,0);
 }
 
 static void aim_info_data_cleanup(info_window * iw)