soc.2010.msn-tlc: 3d5d87c1: Use better function names.
masca at cpw.pidgin.im
masca at cpw.pidgin.im
Sat Jun 12 17:45:54 EDT 2010
-----------------------------------------------------------------
Revision: 3d5d87c16b3ebcaf8c44aa828aa50ba9bb73fe05
Ancestor: 39e9d0d35f265ccc2eda57be427140e9a587fc2f
Author: masca at cpw.pidgin.im
Date: 2010-06-12T21:38:32
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/3d5d87c16b3ebcaf8c44aa828aa50ba9bb73fe05
Modified files:
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slpmsg.c
libpurple/protocols/msn/slpmsg.h
ChangeLog:
Use better function names.
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c 8a50a90b765b9fc7a4013b8f1c1ca062c3a4100a
+++ libpurple/protocols/msn/slp.c 36c16b64c8fc663ba1a55928b513a7f505c6bc1e
@@ -509,12 +509,12 @@ got_sessionreq(MsnSlpCall *slpcall, cons
if (img != NULL) {
/* DATA PREP */
- slpmsg = msn_slpmsg_new_dataprep(slpcall);
+ slpmsg = msn_slpmsg_dataprep_new(slpcall);
msn_slpmsg_set_slplink(slpmsg, slplink);
msn_slplink_queue_slpmsg(slplink, slpmsg);
/* DATA */
- slpmsg = msn_slpmsg_new_obj(slpcall, img);
+ slpmsg = msn_slpmsg_obj_new(slpcall, img);
msn_slpmsg_set_slplink(slpmsg, slplink);
msn_slplink_queue_slpmsg(slplink, slpmsg);
purple_imgstore_unref(img);
============================================================
--- libpurple/protocols/msn/slplink.c 1f00da23217b1437e514e12fb5a4913227dce5a6
+++ libpurple/protocols/msn/slplink.c 1a8038e7777a9d00932fc382939a436d301dae21
@@ -505,7 +505,7 @@ msn_slplink_create_ack(MsnSlpLink *slpli
{
MsnSlpMessage *slpmsg;
- slpmsg = msn_slpmsg_new_ack(header);
+ slpmsg = msn_slpmsg_ack_new(header);
msn_slpmsg_set_slplink(slpmsg, slplink);
return slpmsg;
@@ -538,7 +538,7 @@ send_file_cb(MsnSlpCall *slpcall)
}
purple_xfer_unref(xfer);
- slpmsg = msn_slpmsg_new_file(slpcall, purple_xfer_get_size(xfer));
+ slpmsg = msn_slpmsg_file_new(slpcall, purple_xfer_get_size(xfer));
msn_slpmsg_set_slplink(slpmsg, slpcall->slplink);
msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
============================================================
--- libpurple/protocols/msn/slpmsg.c bb2aeab4fa57ecd93d19017da57649702c4681e6
+++ libpurple/protocols/msn/slpmsg.c acfbd76951c87394b517da9440fa6e63a1526ef6
@@ -263,7 +263,7 @@ msn_slpmsg_sip_new(MsnSlpCall *slpcall,
return slpmsg;
}
-MsnSlpMessage *msn_slpmsg_new_ack(MsnP2PHeader *header)
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header)
{
MsnSlpMessage *slpmsg;
@@ -280,7 +280,7 @@ MsnSlpMessage *msn_slpmsg_new_ack(MsnP2P
return slpmsg;
}
-MsnSlpMessage *msn_slpmsg_new_obj(MsnSlpCall *slpcall,PurpleStoredImage *img)
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img)
{
MsnSlpMessage *slpmsg;
@@ -294,7 +294,7 @@ MsnSlpMessage *msn_slpmsg_new_obj(MsnSlp
return slpmsg;
}
-MsnSlpMessage *msn_slpmsg_new_dataprep(MsnSlpCall *slpcall)
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall)
{
MsnSlpMessage *slpmsg;
@@ -308,7 +308,7 @@ MsnSlpMessage *msn_slpmsg_new_dataprep(M
}
-MsnSlpMessage *msn_slpmsg_new_file(MsnSlpCall *slpcall, size_t size)
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size)
{
MsnSlpMessage *slpmsg;
============================================================
--- libpurple/protocols/msn/slpmsg.h 2e10f8f669df5d84cc962252515db2d833995c46
+++ libpurple/protocols/msn/slpmsg.h 2e246a268658e331b764f6275bad04acb9a1e86e
@@ -136,7 +136,7 @@ MsnSlpMessage * msn_slpmsg_sip_new(MsnSl
*
* @return A new SlpMessage with ACK headers
*/
-MsnSlpMessage *msn_slpmsg_new_ack(MsnP2PHeader *header);
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header);
/**
* Create a new SLP message for MsnObject data.
@@ -146,7 +146,7 @@ MsnSlpMessage *msn_slpmsg_new_ack(MsnP2P
*
* @return A new SlpMessage with MsnObject info.
*/
-MsnSlpMessage *msn_slpmsg_new_obj(MsnSlpCall *slpcall, PurpleStoredImage *img);
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img);
/**
* Create a new SLP message for data preparation.
@@ -155,7 +155,7 @@ MsnSlpMessage *msn_slpmsg_new_obj(MsnSlp
*
* @return A new SlpMessage with data preparation info.
*/
-MsnSlpMessage *msn_slpmsg_new_dataprep(MsnSlpCall *slpcall);
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall);
/**
* Create a new SLP message for File transfer.
@@ -165,7 +165,7 @@ MsnSlpMessage *msn_slpmsg_new_dataprep(M
*
* @return A new SlpMessage with the file transfer info.
*/
-MsnSlpMessage *msn_slpmsg_new_file(MsnSlpCall *slpcall, size_t size);
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size);
void msn_slpmsg_show(MsnMessage *msg);
More information about the Commits
mailing list