[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.3,1.4

[Colin Leroy <address@hidden>]

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

Modified Files:
        yahoo.c 
Log Message:
cleaning


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yahoo.c     4 Jan 2003 13:59:27 -0000       1.3
+++ yahoo.c     9 Jan 2003 00:50:50 -0000       1.4
@@ -1220,9 +1220,11 @@
 
        ycrd = room->protocol_local_chat_room_data;
        ela = room->chat_room_account;
+       ylad = ela->protocol_local_account_data;
+       if(!ycrd || !ylad)
+               return;
        if(!strcmp(ycrd->host, ylad->act_id))   /* I'm the host */
                return;
-       ylad = ela->protocol_local_account_data;
        yahoo_conference_logon(ycrd->id, ylad->act_id, ycrd->members, 
ycrd->room);
        
        for(l = ycrd->members; l; l=l->next) {
@@ -1298,7 +1300,6 @@
        ecr->fellows = NULL;
        ecr->connected = FALSE;
        ecr->chat_room_account = ela;
-       ecr->protocol_local_chat_room_data = ycrd;
        
        ycrd->id = ylad->id;
        ycrd->host = g_strdup(ylad->act_id);
@@ -1306,6 +1307,8 @@
        ycrd->members = members;
        ycrd->connected = FALSE;
        
+       ecr->protocol_local_chat_room_data = ycrd;
+
        eb_join_chat_room(ecr);
        eb_chat_room_buddy_arrive(ecr, ela->alias, ylad->act_id);
        return ecr;