[Ayttm-commits] CVS: ayttm/modules/jabber jabber.c,1.7,1.8

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/jabber
In directory subversions:/tmp/cvs-serv30500/modules/jabber

Modified Files:
        jabber.c 
Log Message:
get_status_pixmap in irc and jabber

Index: jabber.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/jabber/jabber.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jabber.c    26 Jan 2003 08:39:23 -0000      1.7
+++ jabber.c    28 Jan 2003 06:20:06 -0000      1.8
@@ -143,13 +143,13 @@
 
 typedef struct _eb_jabber_account_data
 {
-       gint status;            //the status of the user
+       int status;             //the status of the user
        JABBER_Conn *JConn;     //The connection we know about them from
 } eb_jabber_account_data;
 
 typedef struct _jabber_info_data
 {
-    gchar *profile;
+    char *profile;
 } jabber_info_data;
 
 
@@ -217,7 +217,7 @@
     eb_debug(DBG_JBR, "<");
 }
 
-static gboolean eb_jabber_query_connected( eb_account * account )
+static int eb_jabber_query_connected( eb_account * account )
 {
     eb_jabber_account_data * jad = account->protocol_account_data;
 
@@ -294,7 +294,7 @@
 }
 
 static void eb_jabber_send_im( eb_local_account * from, eb_account * 
account_to, 
-                                        gchar * message)
+                                        char * message)
 {
        eb_jabber_account_data * jad = account_to->protocol_account_data;
 
@@ -401,14 +401,14 @@
        return NULL;
 }
 
-static gint eb_jabber_get_current_state( eb_local_account * account )
+static int eb_jabber_get_current_state( eb_local_account * account )
 {
        eb_jabber_local_account_data * jlad = 
account->protocol_local_account_data;
        eb_debug(DBG_JBR, "returning: %i\n", jlad->status);
        return jlad->status;
 }
 
-static void eb_jabber_set_current_state( eb_local_account * account, gint 
state )
+static void eb_jabber_set_current_state( eb_local_account * account, int state 
)
 {
        eb_jabber_local_account_data * jlad = 
account->protocol_local_account_data;
 
@@ -460,7 +460,7 @@
     account->protocol_account_data=NULL;
 }
 
-static eb_account * eb_jabber_new_account( gchar * account )
+static eb_account * eb_jabber_new_account( char * account )
 {
        eb_account * ea = g_new0(eb_account, 1);
        eb_jabber_account_data * jad = g_new0( eb_jabber_account_data, 1 );
@@ -473,14 +473,14 @@
        return ea;
 }
 
-static gint pixmaps = 0;
+static int pixmaps = 0;
 static GdkPixmap * eb_jabber_pixmap[JABBER_OFFLINE+1];
 static GdkBitmap * eb_jabber_bitmap[JABBER_OFFLINE+1];
 
 static void eb_jabber_init_pixmaps()
 {
-       gint i;
-       gchar ** xpm;
+       int i;
+       char ** xpm;
 
        for (i=JABBER_ONLINE; i<=JABBER_OFFLINE; i++) {
                switch(i) {
@@ -501,27 +501,29 @@
        pixmaps = 1;
 }
 
-static void eb_jabber_get_status_pixmap( eb_account * account, GdkPixmap ** 
pm, GdkBitmap ** bm )
+static char ** eb_jabber_get_status_pixmap( eb_account * account)
 {
        eb_jabber_account_data * jad;
 
-       if (!pixmaps)
-               eb_jabber_init_pixmaps();
+       /*if (!pixmaps)
+               eb_jabber_init_pixmaps();*/
        
        jad = account->protocol_account_data;
        
-       *pm = eb_jabber_pixmap[jad->status];
-       *bm = eb_jabber_bitmap[jad->status];
+       if(jad->status == JABBER_ONLINE)
+               return jabber_online_xpm;
+       else
+               return jabber_away_xpm;
 }
 
 
-static gchar * eb_jabber_get_status_string( eb_account * account )
+static char * eb_jabber_get_status_string( eb_account * account )
 {
        eb_jabber_account_data * jad = account->protocol_account_data;
        return jabber_status_strings[jad->status];
 }
 
-static void eb_jabber_set_idle( eb_local_account * account, gint idle )
+static void eb_jabber_set_idle( eb_local_account * account, int idle )
 {
     if ((idle == 0) && eb_jabber_get_current_state(account) == JABBER_AWAY)
     {
@@ -565,7 +567,7 @@
 
 }
 
-static void eb_jabber_send_chat_room_message( eb_chat_room * room, gchar * 
message )
+static void eb_jabber_send_chat_room_message( eb_chat_room * room, char * 
message )
 {
        eb_jabber_local_account_data *jlad = 
room->chat_room_account->protocol_local_account_data;
        JABBER_SendChatRoomMessage(jlad->JConn, room->room_name, message, 
room->chat_room_account->alias);
@@ -586,7 +588,7 @@
        JABBER_LeaveChatRoom(jlad->JConn, room->room_name, 
room->chat_room_account->alias);
 }
 
-static eb_chat_room * eb_jabber_make_chat_room( gchar * name, eb_local_account 
* account )
+static eb_chat_room * eb_jabber_make_chat_room( char * name, eb_local_account 
* account )
 {
        eb_chat_room *ecr = g_new0(eb_chat_room, 1);
        char *ptr=NULL;
@@ -617,7 +619,7 @@
 
 static void eb_jabber_get_info( eb_local_account * reciever, eb_account * 
sender)
 {
-   gchar buff[1024];
+   char buff[1024];
 
    eb_debug(DBG_JBR, "Not implemented yet\n");
    if(sender->infowindow == NULL){
@@ -647,7 +649,7 @@
 
 
 static void jabber_info_update(eb_account *account) {
-  gchar buff[1024];
+  char buff[1024];
   info_window *iw=account->infowindow;
   jabber_info_data * mid = (jabber_info_data *)iw->info_data;
 
@@ -779,7 +781,7 @@
 {
        eb_chat_room *ecr=find_chat_room_by_id(id);
        eb_account *ea=find_account_by_handle(user, SERVICE_INFO.protocol_id);
-       gchar *message2 = linkify(message);
+       char *message2 = linkify(message);
 
        if(!ecr)
        {