Mercurial > pidgin
diff libpurple/ft.h @ 27901:c93ed4d7cabe
merge of 'abdecd59fbf18da0d4f391df390910b525356ffb'
and 'f005961acc673854916055d8bc491c28f9fb63f0'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 13 Aug 2009 03:28:38 +0000 |
| parents | dad4cb8f81df |
| children | 583a2f6ae576 52cb819c6668 |
line wrap: on
line diff
--- a/libpurple/ft.h Thu Aug 13 03:26:27 2009 +0000 +++ b/libpurple/ft.h Thu Aug 13 03:28:38 2009 +0000 @@ -89,7 +89,7 @@ * size on error. * @since 2.6.0 */ - gssize (*write)(PurpleXfer *xfer, const guchar *buffer, gssize size); + gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size); /** * UI op to read data to send to the prpl for a file transfer. @@ -104,7 +104,7 @@ * should be cancelled (libpurple will cancel). * @since 2.6.0 */ - gssize (*read)(PurpleXfer *xfer, guchar **buffer, gssize size); + gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size); /** * Op to notify the UI that not all the data read in was written. The UI