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

[Colin Leroy <address@hidden>]

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

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


Index: irc.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/irc/irc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- irc.c       31 Jan 2003 13:30:41 -0000      1.11
+++ irc.c       6 Feb 2003 09:15:37 -0000       1.12
@@ -724,7 +724,7 @@
                for(node = chat_rooms; node; node = node->next)
                {
                        ecr = (eb_chat_room*)node->data;
-                       if (ecr && ecr->service_id == SERVICE_INFO.protocol_id 
) 
+                       if (ecr && ecr->local_user->service_id == 
SERVICE_INFO.protocol_id ) 
                        {
                                char ** buff3 = g_strsplit(ecr->id, "@", 2);
                                if(!strcmp(buff3[1], ila->server)
@@ -783,7 +783,7 @@
                for(node = chat_rooms; node; node = node->next)
                {
                        ecr = (eb_chat_room*)node->data;
-                       if (ecr && ecr->service_id == SERVICE_INFO.protocol_id 
) 
+                       if (ecr && ecr->local_user->service_id == 
SERVICE_INFO.protocol_id ) 
                        {
                                char ** buff3 = g_strsplit(ecr->id, "@", 2);
                                if(!strcmp(buff3[1], ila->server) 
@@ -1776,12 +1776,12 @@
 {
        char buff[BUF_LEN];
        signed int ret;
-       irc_local_account * ila = (irc_local_account *) 
room->chat_room_account->protocol_local_account_data;
+       irc_local_account * ila = (irc_local_account *) 
room->local_user->protocol_local_account_data;
 
        g_snprintf(buff, BUF_LEN, "JOIN :%s\n", room->room_name);
                        
        ret = sendall(ila->fd, buff, strlen(buff));
-       if (ret == -1) irc_logout(room->chat_room_account);
+       if (ret == -1) irc_logout(room->local_user);
        return;
 }
 
@@ -1789,12 +1789,12 @@
 {
        char buff[BUF_LEN];
        signed int ret;
-       irc_local_account * ila = (irc_local_account *) 
room->chat_room_account->protocol_local_account_data;
+       irc_local_account * ila = (irc_local_account *) 
room->local_user->protocol_local_account_data;
 
        g_snprintf(buff, BUF_LEN, "PART :%s\n", room->room_name);
                        
        ret = sendall(ila->fd, buff, strlen(buff));
-       if (ret == -1) irc_logout(room->chat_room_account);
+       if (ret == -1) irc_logout(room->local_user);
        return;
 }
 
@@ -1805,14 +1805,14 @@
        char *alpha;
        signed int ret;
 
-       irc_local_account * ila = (irc_local_account *) 
room->chat_room_account->protocol_local_account_data;
+       irc_local_account * ila = (irc_local_account *) 
room->local_user->protocol_local_account_data;
 
        g_snprintf(buff, BUF_LEN, "PRIVMSG %s :%s\n", room->room_name, message);
                        
        ret = sendall(ila->fd, buff, strlen(buff));
-       if (ret == -1) irc_logout(room->chat_room_account);
+       if (ret == -1) irc_logout(room->local_user);
 
-       strcpy(nick, room->chat_room_account->alias);
+       strcpy(nick, room->local_user->alias);
        alpha = strchr(nick, '@');
        if (alpha != NULL) *alpha = '\0';
                
@@ -1825,19 +1825,19 @@
 {
        char buff[BUF_LEN];
        signed int ret;
-       irc_local_account * ila = (irc_local_account *) 
room->chat_room_account->protocol_local_account_data;
+       irc_local_account * ila = (irc_local_account *) 
room->local_user->protocol_local_account_data;
 
        if (*message) {
                g_snprintf(buff, BUF_LEN, "PRIVMSG %s :%s\n", user, message);
                        
                ret = sendall(ila->fd, buff, strlen(buff));
-               if (ret == -1) irc_logout(room->chat_room_account);
+               if (ret == -1) irc_logout(room->local_user);
        }
 
        g_snprintf(buff, BUF_LEN, "INVITE %s :%s\n", user, room->room_name);
                        
        ret = sendall(ila->fd, buff, strlen(buff));
-       if (ret == -1) irc_logout(room->chat_room_account);
+       if (ret == -1) irc_logout(room->local_user);
                
        if (*message) {
                g_snprintf(buff, BUF_LEN, _(">>> Inviting %s [%s] <<<"), user, 
message);
@@ -1845,7 +1845,7 @@
                g_snprintf(buff, BUF_LEN, _(">>> Inviting %s <<<"), user);
        }
                
-       eb_chat_room_show_message( room, room->chat_room_account->alias, buff);
+       eb_chat_room_show_message( room, room->local_user->alias, buff);
        return;
 }
 
@@ -1908,7 +1908,7 @@
        strcpy(ecr->room_name, channelname);
 
        ecr->connected = 0;
-       ecr->chat_room_account = irc_search_for_local_account (chatroom_server);
+       ecr->local_user = irc_search_for_local_account (chatroom_server);
 
        eb_join_chat_room(ecr);