# HG changeset patch # User masca@cpw.pidgin.im # Date 1276378712 0 # Node ID 9192c59f2f84b344a2e0af2f3bd7bcc42e97d74f # Parent 64a6ce55aa632eeb2bed8b45952bd9d5eb33c95c Use better function names. diff -r 64a6ce55aa63 -r 9192c59f2f84 libpurple/protocols/msn/slp.c --- a/libpurple/protocols/msn/slp.c Sat Jun 12 21:22:06 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Sat Jun 12 21:38:32 2010 +0000 @@ -509,12 +509,12 @@ 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); diff -r 64a6ce55aa63 -r 9192c59f2f84 libpurple/protocols/msn/slplink.c --- a/libpurple/protocols/msn/slplink.c Sat Jun 12 21:22:06 2010 +0000 +++ b/libpurple/protocols/msn/slplink.c Sat Jun 12 21:38:32 2010 +0000 @@ -505,7 +505,7 @@ { 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 @@ } 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); diff -r 64a6ce55aa63 -r 9192c59f2f84 libpurple/protocols/msn/slpmsg.c --- a/libpurple/protocols/msn/slpmsg.c Sat Jun 12 21:22:06 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Sat Jun 12 21:38:32 2010 +0000 @@ -263,7 +263,7 @@ return slpmsg; } -MsnSlpMessage *msn_slpmsg_new_ack(MsnP2PHeader *header) +MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header) { MsnSlpMessage *slpmsg; @@ -280,7 +280,7 @@ 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 @@ 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_file(MsnSlpCall *slpcall, size_t size) +MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size) { MsnSlpMessage *slpmsg; diff -r 64a6ce55aa63 -r 9192c59f2f84 libpurple/protocols/msn/slpmsg.h --- a/libpurple/protocols/msn/slpmsg.h Sat Jun 12 21:22:06 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg.h Sat Jun 12 21:38:32 2010 +0000 @@ -136,7 +136,7 @@ * * @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 @@ * * @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 @@ * * @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 @@ * * @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);