pidgin: 273978c7: Reame msn_slplink_unleash to msn_slplink...
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Nov 13 04:05:22 EST 2008
-----------------------------------------------------------------
Revision: 273978c7f7c423ce2e8c088d6078dac589efb5d7
Ancestor: 7e2aa3946cbcbd81736f3653115a05c60432bc8a
Author: markdoliner at pidgin.im
Date: 2008-11-13T08:45:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/273978c7f7c423ce2e8c088d6078dac589efb5d7
Modified files:
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slpcall.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slplink.h
ChangeLog:
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
think is more descriptive
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c 1ec11be33bb2bd946e88d693e415c307afb8cdbc
+++ libpurple/protocols/msn/slp.c 6210d9ca7dd04987fb5eb1a03f09e67c1852e240
@@ -97,7 +97,7 @@ msn_xfer_init(PurpleXfer *xfer)
content);
g_free(content);
- msn_slplink_unleash(slpcall->slplink);
+ msn_slplink_send_queued_slpmsgs(slpcall->slplink);
}
void
@@ -126,7 +126,7 @@ msn_xfer_cancel(PurpleXfer *xfer)
content);
g_free(content);
- msn_slplink_unleash(slpcall->slplink);
+ msn_slplink_send_queued_slpmsgs(slpcall->slplink);
msn_slpcall_destroy(slpcall);
}
============================================================
--- libpurple/protocols/msn/slpcall.c c5004fb5cc7950e96d87bb09951d0a110e9cb8f2
+++ libpurple/protocols/msn/slpcall.c e319e892a8ec90822c038a7e5ce5c78ec61d1cfd
@@ -191,7 +191,7 @@ msn_slpcall_close(MsnSlpCall *slpcall)
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);
}
============================================================
--- libpurple/protocols/msn/slplink.c 4dc11acc33b0fc0859455561f0f1714edf315bba
+++ libpurple/protocols/msn/slplink.c 3001e57782ffd0495606da0325e63d24e84b3341
@@ -412,12 +412,11 @@ void
}
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 @@ msn_slplink_process_msg(MsnSlpLink *slpl
/* 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);
============================================================
--- libpurple/protocols/msn/slplink.h 70be62b0411f15c98789bbcde66cfab19144edd4
+++ libpurple/protocols/msn/slplink.h d394140209c7b703a2298ade35c7443b236b37e6
@@ -82,7 +82,7 @@ void msn_slplink_send_slpmsg(MsnSlpLink
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);
More information about the Commits
mailing list