[Ayttm-commits] CVS: ayttm/modules/icq Makefile.am,1.4,1.5 icq.c,1.9,1.10

[Colin Leroy <address@hidden>]

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

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


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 19 Jan 2003 14:00:18 -0000      1.4
+++ Makefile.am 27 Jan 2003 21:31:12 -0000      1.5
@@ -1,7 +1,7 @@
 SUBDIRS = libicq
 libdir = $(pkgdatadir)/modules
 
-AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src
+AM_CFLAGS = -I$(top_srcdir)/src
 
 EXTRA_DIST = icq_mod.h
 

Index: icq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/icq.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icq.c       25 Jan 2003 13:15:48 -0000      1.9
+++ icq.c       27 Jan 2003 21:31:12 -0000      1.10
@@ -48,11 +48,10 @@
 #include "icq_mod.h"
 #include "libicq/tcp.h"
 #include "info_window.h"
-#include "gtk_eb_html.h"
 #include "src/util.h"
 #include "value_pair.h"
 #include "dialog.h"
-#include "gtk_globals.h"
+#include "globals.h"
 #include "plugin_api.h"
 #include "smileys.h"
 
@@ -340,15 +339,14 @@
 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 void icq_info_update(info_window *iw); 
+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);
 
 
-static void authorize_callback( GtkWidget * widget, gpointer data )
+static void authorize_callback(gpointer data, int response )
 {
        long uin = (long)data;
-       int response = (int)gtk_object_get_user_data(GTK_OBJECT(widget));
 
        if(response)
        {
@@ -365,12 +363,7 @@
     eb_debug(DBG_ICQ, "EventLogin\n");
        set_status=STATUS_ONLINE;
        connection = STATUS_ONLINE;
-/*
-       gtk_widget_destroy(icq_user_account->status_button);
-       icq_user_account->status_button = MakeStatusButton(icq_user_account);
-       gtk_widget_show(icq_user_account->status_button);
-       
gtk_container_add(GTK_CONTAINER(icq_user_account->status_frame),icq_user_account->status_button);
-*/
+
        icq_user_account->connected = 1;
        if(icq_user_account->status_menu)
                eb_set_active_menu_status(icq_user_account->status_menu, 
ICQ_ONLINE);
@@ -389,12 +382,7 @@
        icq_logout(icq_user_account);
        connection = STATUS_OFFLINE;
        set_status=STATUS_OFFLINE;
-/*
-       gtk_widget_destroy(icq_user_account->status_button);
-       icq_user_account->status_button = MakeStatusButton(icq_user_account);
-       gtk_widget_show(icq_user_account->status_button);
-       
gtk_container_add(GTK_CONTAINER(icq_user_account->status_frame),icq_user_account->status_button);
-*/
+
        icq_user_account->connected = 0;
        if(icq_user_account->status_menu)
                eb_set_active_menu_status(icq_user_account->status_menu, 
ICQ_OFFLINE);
@@ -656,7 +644,7 @@
                 free(((icq_info_data* )sender->infowindow->info_data)->away); 
              ((icq_info_data* )sender->infowindow->info_data)->away = 
malloc(strlen(c_messg->msg)+1);
             strcpy(((icq_info_data* 
)sender->infowindow->info_data)->away,c_messg->msg);
-           icq_info_update(sender->infowindow);  
+           icq_info_update(sender);  
           }
           if(sender->account_contact->chatwindow != NULL) {
                g_snprintf(message,1024, _("User is away: %s"), c_messg->msg );
@@ -702,7 +690,7 @@
                g_snprintf(dialog_message, 1024, _("ICQ user %s would like to 
add you to their contact list.\nReason: %s\nWould you like to authorize them?"),
                                c_messg->msg, c+1 );
 
-               do_dialog( dialog_message, _("Authorize ICQ User"), 
authorize_callback,
+               eb_do_dialog( dialog_message, _("Authorize ICQ User"), 
authorize_callback,
                                        (gpointer)c_messg->uin );
 
                return;
@@ -821,7 +809,7 @@
 
                    ((icq_info_data *)ea->infowindow->info_data)->user_info = 
malloc(sizeof(USER_INFO));
                    memcpy( ((icq_info_data 
*)ea->infowindow->info_data)->user_info, ui, sizeof(USER_INFO));
-                   icq_info_update(ea->infowindow);
+                   icq_info_update(ea);
                }
             }
         }
@@ -863,7 +851,7 @@
 
                     ((icq_info_data *)ea->infowindow->info_data)->ext_info = 
malloc(sizeof(USER_EXT_INFO));
                     memcpy( ((icq_info_data 
*)ea->infowindow->info_data)->ext_info, ui, sizeof(USER_EXT_INFO));
-                    icq_info_update(ea->infowindow);
+                    icq_info_update(ea);
                   }
                 }
         }
@@ -1251,87 +1239,23 @@
        return NULL;
 }
 
-
-static gint pixmaps = 0;
-static GdkPixmap * icq_pixmap[ICQ_FREE_CHAT+1];
-static GdkBitmap * icq_bitmap[ICQ_FREE_CHAT+1];
-
-static void icq_init_pixmaps()
-{
-       gint i;
-       gchar ** xpm;
-       
-       for (i=ICQ_ONLINE; i<=ICQ_FREE_CHAT; i++) {
-               switch(i) {
-               case ICQ_AWAY:
-                       xpm = icq_away_xpm;
-                       break;
-               case ICQ_NA:
-                       xpm = icq_away_xpm;
-                       break;
-               case ICQ_OCCUPIED:
-                       xpm = icq_away_xpm;
-                       break;
-               case ICQ_DND:
-                       xpm = icq_away_xpm;
-                       break;
-               case ICQ_OFFLINE:
-                       xpm = icq_away_xpm;
-                       break;
-                case ICQ_FREE_CHAT:
-                        xpm = icq_online_xpm;
-                        break;
-               default:
-                       xpm = icq_online_xpm;
-                       break;
-               }
-               icq_pixmap[i] = 
gdk_pixmap_create_from_xpm_d(statuswindow->window,
-                       &icq_bitmap[i], NULL, xpm);
-       }
-       pixmaps = 1;
-}
-
-static void icq_get_status_pixmap( eb_account * account, GdkPixmap ** pm, 
GdkBitmap ** bm )
+static char **icq_get_status_pixmap( eb_account * account)
 {
        struct icq_account_data * iad;
-       gint icq_status;
-       
-       if (!pixmaps)
-               icq_init_pixmaps();
-       
        iad = account->protocol_account_data;
        
        switch(iad->status) {
        case STATUS_OFFLINE:
-               icq_status = ICQ_OFFLINE;
-               break;
        case STATUS_NA:
-               icq_status = ICQ_NA;
-               break;
-       case STATUS_ONLINE:
-               icq_status = ICQ_ONLINE;
-               break;
        case STATUS_OCCUPIED:
-               icq_status = ICQ_OCCUPIED;
-               break;
        case STATUS_AWAY:
-               icq_status = ICQ_AWAY;
-               break;
        case STATUS_DND:
-               icq_status = ICQ_DND;
-               break;
        case STATUS_INVISIBLE:
-               icq_status = ICQ_INVISIBLE;
-               break;
-        case STATUS_FREE_CHAT:
-                icq_status = ICQ_FREE_CHAT;
-                break;
+               return icq_away_xpm;
        default:
-               icq_status = ICQ_OFFLINE;
+               /* online, freechat */
+               return icq_online_xpm;
        }
-       
-       *pm = icq_pixmap[icq_status];
-       *bm = icq_bitmap[icq_status];
 }
 
 static gchar * icq_get_status_string( eb_account * account )
@@ -1500,7 +1424,6 @@
   if(!account_to->infowindow){
      account_to->infowindow = eb_info_window_new(account_from, account_to);
      account_to->infowindow->cleanup = icq_info_data_cleanup;
-     gtk_widget_show(account_to->infowindow->window);
   }
   if(account_to->infowindow->info_type == -1 || 
account_to->infowindow->info_data == NULL){
     if(account_to->infowindow->info_data == NULL) {
@@ -1516,59 +1439,58 @@
   }
   Send_InfoRequest(remote_uin);
   Send_ExtInfoRequest(remote_uin);
-  //ICQ_Get_Away_Message(remote_uin);
+
 }
 
-static void icq_info_update(info_window *iw) {
+static void icq_info_update(eb_account *sender) {
      gchar buff[255];
+     info_window *iw = sender->infowindow;
+     
      icq_info_data * iid = (icq_info_data *)iw->info_data;
      eb_info_window_clear(iw);
 
-     gtk_eb_html_add(EXT_GTK_TEXT(iw->info),_("ICQ Info:<BR>"),0,0,0);
+     eb_info_window_add_info(sender, _("ICQ Info:<BR>"),0,0,0);
      if(iid->away != NULL) {
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),iid->away,0,0,0);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),"<BR><HR>",0,0,0);
+        eb_info_window_add_info(sender, iid->away,0,0,0);
+        eb_info_window_add_info(sender, "<BR><HR>",0,0,0);
      }
      if(iid->user_info != NULL) {
         USER_INFO_PTR ui = iid->user_info;
         g_snprintf(buff,255, _("UIN: %d<br>"),ui->uin);
-               gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+               eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Nickname: %s<br>"),ui->nick);
-       gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+       eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("First Name: %s<br>"),ui->first);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Last Name: %s<br>"),ui->last);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Email: %s<br>"),ui->email);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         if(ui->auth_required) 
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),_("Authorization 
Required<BR>"),0,0,0);
+        eb_info_window_add_info(sender, _("Authorization Required<BR>"),0,0,0);
 
      }
      if(iid->ext_info != NULL) {
         USER_EXT_INFO_PTR ui = iid->ext_info;
         if(iid->user_info == NULL) {
            g_snprintf(buff,255, _("UIN: %d<br>"),ui->uin);
-           gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+           eb_info_window_add_info(sender, buff,0,0,0);
         }
         g_snprintf(buff,255, _("City: %s<br>"),ui->city);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
-//        g_snprintf(buff,255, "Country: %s<br>",ui->country);
-//        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("State: %s<br>"),ui->state);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Age: %s<br>"),ui->age);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Sex: %s<br>"),ui->sex);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Phone: %s<br>"),ui->phone);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("Url: %s<br>"),ui->url);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
         g_snprintf(buff,255, _("About: %s<br>"),ui->about);
-        gtk_eb_html_add(EXT_GTK_TEXT(iw->info),buff,0,0,0);
+        eb_info_window_add_info(sender, buff,0,0,0);
      }
-     
gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(iw->scrollwindow)),0);
 }
 
 static void icq_info_data_cleanup(info_window *iw){