[Ayttm-commits] CVS: ayttm/modules/workwizu workwizu.c,1.11,1.12

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/workwizu
In directory subversions:/tmp/cvs-serv10142/modules/workwizu

Modified Files:
        workwizu.c 
Log Message:
check nulls once again


Index: workwizu.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/workwizu/workwizu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- workwizu.c  13 Jan 2003 11:37:11 -0000      1.11
+++ workwizu.c  13 Jan 2003 12:09:29 -0000      1.12
@@ -640,11 +640,13 @@
        if (!account->connected) 
                return;
        eb_debug(DBG_MOD, "Logging out\n");
-       for (l = wwz_contacts; l; l = l->next) {
+       for (l = wwz_contacts; l && l->data; l = l->next) {
                eb_account * ea = (eb_account *)find_account_by_handle((char 
*)l->data, SERVICE_INFO.protocol_id);
-               buddy_logoff(ea);
-               eb_workwizu_del_user(ea);
-               buddy_update_status(ea);
+               if(ea) {
+                       buddy_logoff(ea);
+                       eb_workwizu_del_user(ea);
+                       buddy_update_status(ea);
+               }
        }
        account->connected = 0;
        eb_set_active_menu_status(account->status_menu, WWZ_OFFLINE);
@@ -814,6 +816,8 @@
 {
        eb_local_account *account_from = 
find_local_account_by_handle(my_user->username, SERVICE_INFO.protocol_id);
        wwz_account_data *wad = (wwz_account_data 
*)account_from->protocol_local_account_data;
+       if (account == NULL)
+               return;
        wwz_contacts = g_list_append(wwz_contacts, account->handle);
        if (wad->chat_room)
                eb_chat_room_buddy_arrive(wad->chat_room, 
account->account_contact->nick, account->handle);
@@ -824,6 +828,8 @@
 {
        eb_local_account *account_from = 
find_local_account_by_handle(my_user->username, SERVICE_INFO.protocol_id);
        wwz_account_data *wad = (wwz_account_data 
*)account_from->protocol_local_account_data;
+       if (account == NULL) 
+               return;
        wwz_contacts = g_list_remove(wwz_contacts, account->handle);
        if (wad->chat_room)
                eb_chat_room_buddy_leave(wad->chat_room, account->handle);