pidgin: cf1b7bfc: Convert the sametime prpl to use the new...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: cf1b7bfcd02c5eb0f8d46d5213f6484e1a89c023
Parent:   f393466b0c2b9530c5cfb58f0540e30e341b1ef8
Author:   andrew.victor at mxit.com
Date:     08/26/11 14:29:21
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf1b7bfcd02c5eb0f8d46d5213f6484e1a89c023

Changelog: 

Convert the sametime prpl to use the new API.


Changes against parent f393466b0c2b9530c5cfb58f0540e30e341b1ef8

  patched  libpurple/protocols/sametime/sametime.c

-------------- next part --------------
============================================================
--- libpurple/protocols/sametime/sametime.c	93d12d579831ca6ea9f24770b9bf7a2ee563696f
+++ libpurple/protocols/sametime/sametime.c	16c3617b764bce516fca9473a83ba58ca5940cc6
@@ -2139,7 +2139,7 @@ static void ft_incoming_cancel(PurpleXfe
 
 static void ft_incoming_cancel(PurpleXfer *xfer) {
   /* incoming transfer rejected or cancelled in-progress */
-  struct mwFileTransfer *ft = xfer->data;
+  struct mwFileTransfer *ft = purple_xfer_get_protocol_data(xfer);
   if(ft) mwFileTransfer_reject(ft);
 }
 
@@ -2155,7 +2155,7 @@ static void ft_incoming_init(PurpleXfer 
   struct mwFileTransfer *ft;
   FILE *fp;
 
-  ft = xfer->data;
+  ft = purple_xfer_get_protocol_data(xfer);
 
   fp = g_fopen(xfer->local_filename, "wb");
   if(! fp) {
@@ -2202,7 +2202,7 @@ static void mw_ft_offered(struct mwFileT
   {
 	purple_xfer_ref(xfer);
 	mwFileTransfer_setClientData(ft, xfer, (GDestroyNotify) purple_xfer_unref);
-	xfer->data = ft;
+	purple_xfer_set_protocol_data(xfer, ft);
 
 	purple_xfer_set_init_fnc(xfer, ft_incoming_init);
 	purple_xfer_set_cancel_recv_fnc(xfer, ft_incoming_cancel);
@@ -2281,7 +2281,7 @@ static void mw_ft_closed(struct mwFileTr
 
   xfer = mwFileTransfer_getClientData(ft);
   if(xfer) {
-    xfer->data = NULL;
+    purple_xfer_set_protocol_data(xfer, NULL);
 
     if(! mwFileTransfer_getRemaining(ft)) {
       purple_xfer_set_completed(xfer, TRUE);
@@ -5106,14 +5106,14 @@ static void ft_outgoing_init(PurpleXfer 
 
   purple_xfer_ref(xfer);
   mwFileTransfer_setClientData(ft, xfer, (GDestroyNotify) purple_xfer_unref);
-  xfer->data = ft;
+  purple_xfer_set_protocol_data(xfer, ft);
 
   mwFileTransfer_offer(ft);
 }
 
 
 static void ft_outgoing_cancel(PurpleXfer *xfer) {
-  struct mwFileTransfer *ft = xfer->data;
+  struct mwFileTransfer *ft = purple_xfer_get_protocol_data(xfer);
 
   DEBUG_INFO("ft_outgoing_cancel called\n");