[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.48,1.49

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory subversions:/tmp/cvs-serv13321/modules/msn2

Modified Files:
        msn.C 
Log Message:
remove more gtk deps from modules


Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- msn.C       27 Jan 2003 11:44:57 -0000      1.48
+++ msn.C       27 Jan 2003 17:12:59 -0000      1.49
@@ -159,7 +159,7 @@
 static LList *msn_grouplist;
 static int listsyncing=0;
 
-#include "gtk_globals.h"
+/* #include "gtk_globals.h"*/
 
 /*  Module Exports */
 PLUGIN_INFO plugin_info = {
@@ -1020,42 +1020,15 @@
        return ea;
 }
 
-static gint pixmaps = 0;
-static GdkPixmap * eb_msn_pixmap[MSN_OFFLINE+1];
-static GdkBitmap * eb_msn_bitmap[MSN_OFFLINE+1];
 
-void eb_msn_init_pixmaps()
+char **eb_msn_get_status_pixmap( eb_account * account)
 {
-       gint i;
-       gchar ** xpm;
-
-       for (i=MSN_ONLINE; i<=MSN_OFFLINE; i++) {
-               switch(i)
-               {
-               case MSN_ONLINE:
-                       xpm = msn_online_xpm;
-                       break;
-               default:
-                       xpm = msn_away_xpm;
-                       break;
-               }
-               eb_msn_pixmap[i] = 
gdk_pixmap_create_from_xpm_d(statuswindow->window,
-                       &eb_msn_bitmap[i], NULL, xpm);
-       }
-       pixmaps = 1;
-}
-
-void eb_msn_get_status_pixmap( eb_account * account, GdkPixmap ** pm, 
GdkBitmap ** bm )
-{
-       eb_msn_account_data * mad;
-
-       if (!pixmaps)
-               eb_msn_init_pixmaps();
-
-       mad = (eb_msn_account_data *)account->protocol_account_data;
+       eb_msn_account_data * mad = (eb_msn_account_data 
*)account->protocol_account_data;
 
-       *pm = eb_msn_pixmap[mad->status];
-       *bm = eb_msn_bitmap[mad->status];
+       if (mad->status == MSN_ONLINE)
+               return msn_online_xpm;
+       else 
+               return msn_away_xpm;
 }
 
 gchar * eb_msn_get_status_string( eb_account * account )
@@ -1316,7 +1289,7 @@
                strcpy(tomove->handle, ea->handle);
                strcpy(tomove->newgr, int_new_group);
                strcpy(tomove->oldgr, int_old_group);
-               eb_timeout_add(1000, (GtkFunction)finish_group_move, 
(gpointer)tomove);
+               eb_timeout_add(1000, (eb_timeout_function)finish_group_move, 
(gpointer)tomove);
                return;
        } 
        msn_change_group(mainconn, ea->handle, oldid, newid);
@@ -1548,7 +1521,7 @@
   msn_set_state(conn, "NLN");
   /* hack to check conn status */
   if (conncheck_handler == -1 && do_check_connection)
-     conncheck_handler = eb_timeout_add(10000, (GtkFunction)checkconn, 
(gpointer)conn);
+     conncheck_handler = eb_timeout_add(10000, (eb_timeout_function)checkconn, 
(gpointer)conn);
 
   for(existing; existing != NULL && existing->data != NULL; existing = 
existing->next) {
         char *cnt = (char*) existing->data;