[Ayttm-commits] CVS: ayttm/modules/jabber jabber.c,1.10,1.11

[Colin Leroy <address@hidden>]

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

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


Index: jabber.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/jabber/jabber.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jabber.c    31 Jan 2003 13:30:41 -0000      1.10
+++ jabber.c    6 Feb 2003 09:15:37 -0000       1.11
@@ -569,23 +569,23 @@
 
 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);
+       eb_jabber_local_account_data *jlad = 
room->local_user->protocol_local_account_data;
+       JABBER_SendChatRoomMessage(jlad->JConn, room->room_name, message, 
room->local_user->alias);
 }
 
 static void eb_jabber_join_chat_room( eb_chat_room * room )
 {
-       eb_jabber_local_account_data *jlad = 
room->chat_room_account->protocol_local_account_data;
+       eb_jabber_local_account_data *jlad = 
room->local_user->protocol_local_account_data;
 
        eb_debug(DBG_JBR, ">\n");
-       JABBER_JoinChatRoom(jlad->JConn, room->room_name, 
room->chat_room_account->alias);
+       JABBER_JoinChatRoom(jlad->JConn, room->room_name, 
room->local_user->alias);
        eb_debug(DBG_JBR, "<\n");
 }
 
 static void eb_jabber_leave_chat_room( eb_chat_room * room )
 {
-       eb_jabber_local_account_data *jlad = 
room->chat_room_account->protocol_local_account_data;
-       JABBER_LeaveChatRoom(jlad->JConn, room->room_name, 
room->chat_room_account->alias);
+       eb_jabber_local_account_data *jlad = 
room->local_user->protocol_local_account_data;
+       JABBER_LeaveChatRoom(jlad->JConn, room->room_name, 
room->local_user->alias);
 }
 
 static eb_chat_room * eb_jabber_make_chat_room( char * name, eb_local_account 
* account )
@@ -605,7 +605,7 @@
        }
        ecr->fellows = NULL;
        ecr->connected = FALSE;
-       ecr->chat_room_account = account;
+       ecr->local_user = account;
        eb_join_chat_room(ecr);
        eb_debug(DBG_JBR, "<\n");
        return ecr;