[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.25,1.26

[Philip S Tellis <address@hidden>]

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

Modified Files:
        yahoo.c 
Log Message:
set chat room service_id, disable conference typing notify

Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- yahoo.c     24 Jan 2003 20:41:31 -0000      1.25
+++ yahoo.c     27 Jan 2003 08:38:30 -0000      1.26
@@ -1071,6 +1071,8 @@
                chat_rooms = l_list_append(chat_rooms, chat_room);
                chat_room->chat_room_account = ela;
 
+               chat_room->service_id = SERVICE_INFO.protocol_id;
+
                eb_join_chat_room(chat_room);
                eb_chat_room_buddy_arrive(chat_room, 
                                (ea?ea->account_contact->nick:ycrd->host), 
@@ -1130,6 +1132,8 @@
        chat_rooms = l_list_append(chat_rooms, chat_room);
        chat_room->chat_room_account = ela;
 
+       chat_room->service_id = SERVICE_INFO.protocol_id;
+
        eb_join_chat_room(chat_room);
 /*     eb_chat_room_buddy_arrive(chat_room, 
                        (ea?ea->account_contact->nick:ycrd->host), 
@@ -1441,21 +1445,6 @@
        return 20;
 }
 
-static int eb_yahoo_send_cr_typing(eb_chat_room *chatroom)
-{
-       eb_yahoo_chat_room_data *ycrd = chatroom->protocol_local_chat_room_data;
-       eb_local_account *ela = yahoo_find_local_account_by_id(ycrd->id);
-       LList *others;  
-
-       for (others = chatroom->fellows; others && others->data; 
others=others->next) {
-               eb_chat_room_buddy * ecrb = others->data;
-               eb_account *to = find_account_by_handle(ecrb->handle, 
SERVICE_INFO.protocol_id);
-               eb_yahoo_send_typing(ela,to);
-       }
-
-       return 20;
-}
-
 static void ext_yahoo_typing_notify(int id, char *who, int stat)
 {
        eb_account *ea = find_account_by_handle(who, SERVICE_INFO.protocol_id);
@@ -2539,7 +2528,7 @@
 
        sc->send_im                     = eb_yahoo_send_im;
        sc->send_typing                 = eb_yahoo_send_typing;
-       sc->send_cr_typing              = eb_yahoo_send_cr_typing;
+       sc->send_cr_typing              = NULL;
 
        sc->read_local_account_config   = eb_yahoo_read_local_account_config;
        sc->write_local_config          = eb_yahoo_write_local_config;