Mercurial > pidgin
changeset 20770:58ce69a8582d
Correctly remove a buddy from the Pending list after it is accepted.
| author | Carlos Silva <typ0@pidgin.im> |
|---|---|
| date | Thu, 04 Oct 2007 01:40:20 +0000 |
| parents | 53691c081eab |
| children | aaf800eb7d55 |
| files | libpurple/protocols/msn/notification.c libpurple/protocols/msn/soap.c libpurple/protocols/msn/userlist.c |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Wed Oct 03 18:45:31 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu Oct 04 01:40:20 2007 +0000 @@ -1203,8 +1203,6 @@ MsnSession *session = cmdproc->session; const char *type, *value, *friendlyname; - purple_debug_info("MSN Notification", "prp_cmd()\n"); - g_return_if_fail(cmd->param_count >= 3); type = cmd->params[2];
--- a/libpurple/protocols/msn/soap.c Wed Oct 03 18:45:31 2007 +0000 +++ b/libpurple/protocols/msn/soap.c Thu Oct 04 01:40:20 2007 +0000 @@ -765,7 +765,7 @@ * if not connected, Connected first. */ void -msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request) +msn_soap_post(MsnSoapConn *soapconn, MsnSoapReq *request) { MsnSoapReq *head_request; @@ -809,10 +809,15 @@ return; } +#ifdef MSN_SOAP_DEBUG purple_debug_info("MSN SOAP", "Currently processing another SOAP request\n"); } else { purple_debug_info("MSN SOAP", "No requests left to dispatch\n"); } +#else + } +#endif + } /*Post the soap request action*/
--- a/libpurple/protocols/msn/userlist.c Wed Oct 03 18:45:31 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Thu Oct 04 01:40:20 2007 +0000 @@ -53,8 +53,7 @@ msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL); - if (msn_userlist_user_is_in_list(user, MSN_LIST_FL)) - msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL); + msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL); } g_free(pa->who);