pidgin: 2b3a899e: Rename field for consistency.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 2b3a899e8d9c0a3551a68323566a236682a5fcbd
Parent:   c32d9d52ce93f8e9e3a0b8775de560101519a80c
Author:   andrew.victor at mxit.com
Date:     08/26/11 15:33:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2b3a899e8d9c0a3551a68323566a236682a5fcbd

Changelog: 

Rename field for consistency.


Changes against parent c32d9d52ce93f8e9e3a0b8775de560101519a80c

  patched  libpurple/ft.c
  patched  libpurple/ft.h

-------------- next part --------------
============================================================
--- libpurple/ft.c	66c8777ec47420731e9299e0d3f5cccec71d37db
+++ libpurple/ft.c	6ccb858e4663022de27e52c7d0dcfd1d3f9af70b
@@ -1702,19 +1702,19 @@ void
 }
 
 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;
 }
 
 /**************************************************************************
============================================================
--- libpurple/ft.h	4a54188b8ef603a29d301a7a30e92c519cbf402c
+++ libpurple/ft.h	c060e8e950b8ae0b01a23c76470d3502da5c5f64
@@ -185,7 +185,7 @@ struct _PurpleXfer
 	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 @@ void purple_xfer_prepare_thumbnail(Purpl
  *
  * @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 @@ void purple_xfer_set_protocol_data(Purpl
  *
  * @since 3.0.0
  */
-void *purple_xfer_get_protocol_data(PurpleXfer *xfer);
+gpointer purple_xfer_get_protocol_data(PurpleXfer *xfer);
 
 /*@}*/