diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-03 18:17:21 -0500 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-03 18:17:21 -0500 |
| commit | 13f37a7112d05a74b8d59e9de665e131bf76c424 (patch) | |
| tree | fa6c44e160201f90429439f1f85904820f4672e1 /libpurple/xfer.c | |
| parent | 029fb8f0013482b8b72907da10dcf8586044fbf9 (diff) | |
| download | pidgin-13f37a7112d05a74b8d59e9de665e131bf76c424.tar.gz | |
xfer: Rename PurpleProtocolXferInterface.send() to send_file()
With the addition of PurpleProtocolXferInterface, building in Windows
fails due to the redefinition of send() as wpurple_send(). Since a
lot of the prpls already call it this their implementations, this
patch renames it to send_file(). This fixes building on Windows
again.
Diffstat (limited to 'libpurple/xfer.c')
| -rw-r--r-- | libpurple/xfer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpurple/xfer.c b/libpurple/xfer.c index ebf72b05c0..1bf81a6915 100644 --- a/libpurple/xfer.c +++ b/libpurple/xfer.c @@ -2508,10 +2508,10 @@ purple_protocol_xfer_can_receive(PurpleProtocolXfer *prplxfer, } void -purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer, - PurpleConnection *connection, - const gchar *who, - const gchar *filename +purple_protocol_xfer_send_file(PurpleProtocolXfer *prplxfer, + PurpleConnection *connection, + const gchar *who, + const gchar *filename ) { PurpleProtocolXferInterface *iface = NULL; @@ -2521,8 +2521,8 @@ purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer, g_return_if_fail(filename); iface = PURPLE_PROTOCOL_XFER_GET_IFACE(prplxfer); - if(iface && iface->send) - iface->send(prplxfer, connection, who, filename); + if(iface && iface->send_file) + iface->send_file(prplxfer, connection, who, filename); } PurpleXfer * |