[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.39,1.40

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory subversions:/tmp/cvs-serv14654/modules/yahoo2

Modified Files:
        yahoo.c 
Log Message:
chat_window & chat_room structs cleaning


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yahoo.c     5 Feb 2003 15:23:27 -0000       1.39
+++ yahoo.c     6 Feb 2003 09:15:37 -0000       1.40
@@ -1097,9 +1097,7 @@
                chat_room->fellows = NULL;
                chat_room->connected = FALSE;
 
-               chat_room->chat_room_account = ela;
-
-               chat_room->service_id = SERVICE_INFO.protocol_id;
+               chat_room->local_user = ela;
 
                eb_join_chat_room(chat_room);
                eb_chat_room_buddy_arrive(chat_room, 
@@ -1157,9 +1155,7 @@
        chat_room->fellows = NULL;
        chat_room->connected = FALSE;
 
-       chat_room->chat_room_account = ela;
-
-       chat_room->service_id = SERVICE_INFO.protocol_id;
+       chat_room->local_user = ela;
 
        eb_join_chat_room(chat_room);
 /*     eb_chat_room_buddy_arrive(chat_room, 
@@ -1262,7 +1258,7 @@
        if(!message)
                return;
 
-       ylad = room->chat_room_account->protocol_local_account_data;
+       ylad = room->local_user->protocol_local_account_data;
        
        ycrd = room->protocol_local_chat_room_data;
        yahoo_conference_message(ycrd->id, ylad->act_id, ycrd->members, 
ycrd->room, encoded, 1);
@@ -1282,7 +1278,7 @@
        }
 
        ycrd = room->protocol_local_chat_room_data;
-       ela = room->chat_room_account;
+       ela = room->local_user;
        ylad = ela->protocol_local_account_data;
        if(!ycrd || !ylad)
                return;
@@ -1309,7 +1305,7 @@
        }
 
        ycrd = room->protocol_local_chat_room_data;
-       ylad = room->chat_room_account->protocol_local_account_data;
+       ylad = room->local_user->protocol_local_account_data;
        yahoo_conference_logoff(ycrd->id, ylad->act_id, ycrd->members, 
ycrd->room);
 }
 
@@ -1362,7 +1358,7 @@
        strcpy(ecr->id, ecr->room_name);
        ecr->fellows = NULL;
        ecr->connected = FALSE;
-       ecr->chat_room_account = ela;
+       ecr->local_user = ela;
        ecr->protocol_local_chat_room_data = ycrd;
        
        ycrd->id = ylad->id;