Mercurial > pidgin.yaz
changeset 32426:5b5fd57ff3ae
Rename field for consistency.
| author | andrew.victor@mxit.com |
|---|---|
| date | Fri, 26 Aug 2011 19:33:50 +0000 |
| parents | dc4de0b08405 |
| children | ff051a32e1e8 |
| files | libpurple/ft.c libpurple/ft.h |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/ft.c Fri Aug 26 19:23:29 2011 +0000 +++ b/libpurple/ft.c Fri Aug 26 19:33:50 2011 +0000 @@ -1702,19 +1702,19 @@ } void -purple_xfer_set_protocol_data(PurpleXfer *xfer, void *proto_data) +purple_xfer_set_protocol_data(PurpleXfer *xfer, gpointer proto_data) { g_return_if_fail(xfer != NULL); - xfer->data = proto_data; + xfer->proto_data = proto_data; } -void * +gpointer purple_xfer_get_protocol_data(PurpleXfer *xfer) { g_return_val_if_fail(xfer != NULL, NULL); - return xfer->data; + return xfer->proto_data; } /**************************************************************************
--- a/libpurple/ft.h Fri Aug 26 19:23:29 2011 +0000 +++ b/libpurple/ft.h Fri Aug 26 19:33:50 2011 +0000 @@ -185,7 +185,7 @@ PurpleXferUiOps *ui_ops; /**< UI-specific operations. */ void *ui_data; /**< UI-specific data. */ - void *data; /**< prpl-specific data. */ + void *proto_data; /**< prpl-specific data. */ }; #ifdef __cplusplus @@ -745,7 +745,7 @@ * * @since 3.0.0 */ -void purple_xfer_set_protocol_data(PurpleXfer *xfer, void *proto_data); +void purple_xfer_set_protocol_data(PurpleXfer *xfer, gpointer proto_data); /** * Gets the protocol data for a file transfer. @@ -756,7 +756,7 @@ * * @since 3.0.0 */ -void *purple_xfer_get_protocol_data(PurpleXfer *xfer); +gpointer purple_xfer_get_protocol_data(PurpleXfer *xfer); /*@}*/