Mercurial > pidgin.yaz
changeset 24344:bceefbae1ca6
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
think is more descriptive
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 13 Nov 2008 08:45:40 +0000 |
| parents | 9bdaf273c0ff |
| children | b9e09053e53a |
| files | libpurple/protocols/msn/slp.c libpurple/protocols/msn/slpcall.c libpurple/protocols/msn/slplink.c libpurple/protocols/msn/slplink.h |
| diffstat | 4 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Thu Nov 13 08:26:12 2008 +0000 +++ b/libpurple/protocols/msn/slp.c Thu Nov 13 08:45:40 2008 +0000 @@ -97,7 +97,7 @@ content); g_free(content); - msn_slplink_unleash(slpcall->slplink); + msn_slplink_send_queued_slpmsgs(slpcall->slplink); } void @@ -126,7 +126,7 @@ content); g_free(content); - msn_slplink_unleash(slpcall->slplink); + msn_slplink_send_queued_slpmsgs(slpcall->slplink); msn_slpcall_destroy(slpcall); }
--- a/libpurple/protocols/msn/slpcall.c Thu Nov 13 08:26:12 2008 +0000 +++ b/libpurple/protocols/msn/slpcall.c Thu Nov 13 08:45:40 2008 +0000 @@ -191,7 +191,7 @@ g_return_if_fail(slpcall->slplink != NULL); send_bye(slpcall, "application/x-msnmsgr-sessionclosebody"); - msn_slplink_unleash(slpcall->slplink); + msn_slplink_send_queued_slpmsgs(slpcall->slplink); msn_slpcall_destroy(slpcall); }
--- a/libpurple/protocols/msn/slplink.c Thu Nov 13 08:26:12 2008 +0000 +++ b/libpurple/protocols/msn/slplink.c Thu Nov 13 08:45:40 2008 +0000 @@ -412,12 +412,11 @@ } void -msn_slplink_unleash(MsnSlpLink *slplink) +msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink) { MsnSlpMessage *slpmsg; - /* Send the queued msgs in the order they came. */ - + /* Send the queued msgs in the order they were created */ while ((slpmsg = g_queue_pop_tail(slplink->slp_msg_queue)) != NULL) { msn_slplink_release_slpmsg(slplink, slpmsg); @@ -635,7 +634,7 @@ /* Release all the messages and send the ACK */ msn_slplink_send_ack(slplink, msg); - msn_slplink_unleash(slplink); + msn_slplink_send_queued_slpmsgs(slplink); } msn_slpmsg_destroy(slpmsg);
--- a/libpurple/protocols/msn/slplink.h Thu Nov 13 08:26:12 2008 +0000 +++ b/libpurple/protocols/msn/slplink.h Thu Nov 13 08:45:40 2008 +0000 @@ -82,7 +82,7 @@ void msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg); void msn_slplink_send_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg); -void msn_slplink_unleash(MsnSlpLink *slplink); +void msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink); void msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg); void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);