From: Mark D. <the...@us...> - 2003-05-05 23:30:45
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1:/tmp/cvs-serv11298/src/protocols/oscar Modified Files: oscar.c Log Message: <malsyned> Hey, is this a bug? when I block someone and then close their window, I'm told "Your message to (null) did not get sent: In local permit/deny" <faceprint> malsyned: what protocol? <malsyned> Oscar <faceprint> yes, that's a bug <SeanEgan> probably a typing notification thing? This fixes that. And now I should get back to the how you say... ah yes, "studying." Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.349 retrieving revision 1.350 diff -u -d -r1.349 -r1.350 --- oscar.c 27 Apr 2003 04:19:14 -0000 1.349 +++ oscar.c 5 May 2003 23:30:42 -0000 1.350 @@ -4165,14 +4165,19 @@ else aim_odc_send_typing(od->sess, dim->conn, 0x0000); else { - struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(name)); - if (bi && bi->typingnot) { - if (typing == TYPING) - aim_im_sendmtn(od->sess, 0x0001, name, 0x0002); - else if (typing == TYPED) - aim_im_sendmtn(od->sess, 0x0001, name, 0x0001); - else - aim_im_sendmtn(od->sess, 0x0001, name, 0x0000); + /* Don't send if this turkey is in our deny list */ + GSList *list; + for (list=gc->account->deny; (list && aim_sncmp(name, list->data)); list=list->next); + if (!list) { + struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(name)); + if (bi && bi->typingnot) { + if (typing == TYPING) + aim_im_sendmtn(od->sess, 0x0001, name, 0x0002); + else if (typing == TYPED) + aim_im_sendmtn(od->sess, 0x0001, name, 0x0001); + else + aim_im_sendmtn(od->sess, 0x0001, name, 0x0000); + } } } return 0; |