[Ayttm-commits] CVS: ayttm/modules/icq-toc icq-toc.c,1.6,1.7

[Colin Leroy <address@hidden>]

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

Modified Files:
        icq-toc.c 
Log Message:
(more) get rid of gtk deps


Index: icq-toc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/icq-toc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icq-toc.c   23 Jan 2003 06:34:25 -0000      1.6
+++ icq-toc.c   27 Jan 2003 21:31:12 -0000      1.7
@@ -24,7 +24,6 @@
  * ICQ implementation
  */
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,7 +49,6 @@
 #include "chat_room.h"
 #include "value_pair.h"
 #include "info_window.h"
-#include "gtk_eb_html.h"
 #include "input_list.h"
 #include "plugin_api.h"
 #include "smileys.h"
@@ -285,9 +283,8 @@
        return TRUE;
 }
 
-static void eb_icq_process_file_request( GtkWidget * widget, gpointer data )
+static void eb_icq_process_file_request( gpointer data, int accepted )
 {
-       int accepted = (int)gtk_object_get_user_data(GTK_OBJECT(widget));
        eb_icq_file_request * eafr = data;
 
        if(accepted)
@@ -509,7 +506,6 @@
        if(sender->infowindow == NULL )
        {
                sender->infowindow = eb_info_window_new(reciever, sender);
-               gtk_widget_show(sender->infowindow->window);
        }
 
        sender->infowindow->info_data = strdup(message);
@@ -756,14 +752,7 @@
        
        if(account->status_menu)
        {
-               gtk_check_menu_item_set_active
-               (
-                               GTK_CHECK_MENU_ITEM
-                               (
-                                       g_slist_nth(account->status_menu, 
ICQ_ONLINE)->data
-                               ), TRUE
-               );
-
+               eb_set_active_menu_status(ela->status_menu, ICQ_ONLINE);
        }
 
        is_setting_state = 0;
@@ -803,13 +792,7 @@
 #if 0
        if(account->status_menu)
        {
-               gtk_check_menu_item_set_active
-               (
-                               GTK_CHECK_MENU_ITEM
-                               (
-                                       g_slist_nth(account->status_menu, 
ICQ_ONLINE)->data
-                               ), FALSE
-               );
+               eb_set_active_menu_status(ela->status_menu, ICQ_ONLINE);
 
        }
 #endif
@@ -821,13 +804,7 @@
 
        if(account->status_menu)
        {
-               gtk_check_menu_item_set_active
-               (
-                               GTK_CHECK_MENU_ITEM
-                               (
-                                       g_slist_nth(account->status_menu, 
ICQ_OFFLINE)->data
-                               ), TRUE
-               );
+               eb_set_active_menu_status(ela->status_menu, ICQ_OFFLINE);
 
        }
 
@@ -979,10 +956,7 @@
                        eb_icq_login(account);
                        account->connected = 1;
                }
-               if (is_away)
-                       toc_set_away(alad->conn, 
gtk_entry_get_text(GTK_ENTRY(away_message)));
-               else
-                       toc_set_away(alad->conn, _("User is currently away"));
+               toc_set_away(alad->conn, _("User is currently away"));
                break;
        case ICQ_OFFLINE:
                if (account->connected == 1) {
@@ -1003,27 +977,13 @@
        if (message) {
                if(account->status_menu)
                {
-                       gtk_check_menu_item_set_active
-                       (
-                               GTK_CHECK_MENU_ITEM
-                               (
-                                       g_slist_nth(account->status_menu, 
ICQ_AWAY)->data
-                               ), TRUE
-                       );
-
+               eb_set_active_menu_status(ela->status_menu, ICQ_AWAY);
                }
                toc_set_away(alad->conn, message);
        } else {
                if(account->status_menu)
                {
-                       gtk_check_menu_item_set_active
-                       (
-                               GTK_CHECK_MENU_ITEM
-                               (
-                                       g_slist_nth(account->status_menu, 
ICQ_ONLINE)->data
-                               ), TRUE
-                       );
-
+               eb_set_active_menu_status(ela->status_menu, ICQ_ONLINE);
                }
        }
 }
@@ -1123,12 +1083,12 @@
        toc_get_info( alad->conn, account_to->handle );
 }
 
-void icq_info_update(info_window * iw)
+void icq_info_update(eb_account *sender)
 {
+       infowindow *iw = sender->infowindow;
        char * data = (char *)iw->info_data;
        clear_info_window(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);
 }
 
 void icq_info_data_cleanup(info_window * iw)