From: Etan R. <de...@us...> - 2005-03-17 01:54:20
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21073/src/protocols/oscar Modified Files: Tag: oldstatus oscar.c Log Message: When testing a jabber server at work I ran into a buddy list issue, and I realized that it's really not the ui's job to decide when to ask the user about adding a buddy, so I moved the logic to the prpls which will know. I've fixed jabber and oscar (since KingAnt says it's not an issue there). Someone who knows MSN and Yahoo! is going to want to make sure what I have works correctly, and may want to look into handling any cases that might not want to ask the user. Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.663.2.22 retrieving revision 1.663.2.23 diff -u -d -p -r1.663.2.22 -r1.663.2.23 --- oscar.c 11 Mar 2005 04:12:55 -0000 1.663.2.22 +++ oscar.c 17 Mar 2005 01:54:06 -0000 1.663.2.23 @@ -3660,7 +3660,7 @@ static void gaim_auth_grant(struct name_ message = 0; buddy = gaim_find_buddy(gc->account, data->name); aim_im_sendch4(od->sess, data->name, AIM_ICQMSG_AUTHGRANTED, &message); - gaim_account_notify_added(gc->account, NULL, data->name, (buddy ? gaim_buddy_get_alias_only(buddy) : NULL), NULL); + gaim_account_notify_added(gc->account, NULL, data->name, (buddy ? gaim_buddy_get_alias_only(buddy) : NULL), NULL, TRUE); #else aim_ssi_sendauthreply(od->sess, data->name, 0x01, NULL); #endif @@ -6401,7 +6401,7 @@ static int gaim_ssi_gotadded(aim_session buddy = gaim_find_buddy(gc->account, sn); gaim_debug_info("oscar", "ssi: %s added you to their buddy list\n", sn); - gaim_account_notify_added(gc->account, NULL, sn, (buddy ? gaim_buddy_get_alias_only(buddy) : NULL), NULL); + gaim_account_notify_added(gc->account, NULL, sn, (buddy ? gaim_buddy_get_alias_only(buddy) : NULL), NULL, TRUE); return 1; } |