pidgin: 0de22eda: Fix SILC for purple_xfer_[gs][4~et_proto...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 0de22eda160f79c40e05273d6c9a35170a251441
Parent:   51f361332a107d980cc20d39578cfdc923b280ed
Author:   datallah at pidgin.im
Date:     08/28/11 22:53:05
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0de22eda160f79c40e05273d6c9a35170a251441

Changelog: 

Fix SILC for purple_xfer_[gs][4~et_protocol_data.

Changes against parent 51f361332a107d980cc20d39578cfdc923b280ed

  patched  libpurple/protocols/silc/ft.c

-------------- next part --------------
============================================================
--- libpurple/protocols/silc/ft.c	cf0beb6d503ea6d119fbd40ad2ffd6e9dab0e0e1
+++ libpurple/protocols/silc/ft.c	14a1b0816bf84d9ede37b65e7bf08945f015c515
@@ -76,7 +76,7 @@ silcpurple_ftp_monitor(SilcClient client
 
 	if (status == SILC_CLIENT_FILE_MONITOR_CLOSED) {
 		/* All started sessions terminate here */
-		xfer->xfer->data = NULL;
+		purple_xfer_set_protocol_data(xfer->xfer, NULL);
 		purple_xfer_unref(xfer->xfer);
 		silc_free(xfer);
 		return;
@@ -150,7 +150,7 @@ silcpurple_ftp_cancel(PurpleXfer *x)
 static void
 silcpurple_ftp_cancel(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 
 	if (!xfer)
 		return;
@@ -163,7 +163,7 @@ silcpurple_ftp_ask_name_cancel(PurpleXfe
 static void
 silcpurple_ftp_ask_name_cancel(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 
 	if (!xfer)
 		return;
@@ -176,7 +176,7 @@ silcpurple_ftp_ask_name_ok(PurpleXfer *x
 static void
 silcpurple_ftp_ask_name_ok(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 	const char *name;
 
 	if (!xfer)
@@ -212,7 +212,7 @@ silcpurple_ftp_request_result(PurpleXfer
 static void
 silcpurple_ftp_request_result(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 	SilcClientFileError status;
 	PurpleConnection *gc = xfer->sg->gc;
 	SilcClientConnectionParams params;
@@ -337,7 +337,7 @@ void silcpurple_ftp_request(SilcClient c
 	purple_xfer_set_cancel_recv_fnc(xfer->xfer, silcpurple_ftp_cancel);
 	xfer->xfer->remote_ip = g_strdup(hostname);
 	xfer->xfer->remote_port = port;
-	xfer->xfer->data = xfer;
+	purple_xfer_set_protocol_data(xfer->xfer, xfer);
 
 	/* File transfer request */
 	purple_xfer_request(xfer->xfer);
@@ -346,7 +346,7 @@ silcpurple_ftp_send_cancel(PurpleXfer *x
 static void
 silcpurple_ftp_send_cancel(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 
 	if (!xfer)
 		return;
@@ -358,7 +358,7 @@ silcpurple_ftp_send(PurpleXfer *x)
 static void
 silcpurple_ftp_send(PurpleXfer *x)
 {
-	SilcPurpleXfer xfer = x->data;
+	SilcPurpleXfer xfer = purple_xfer_get_protocol_data(x);
 	const char *name;
 	char *local_ip = NULL, *remote_ip = NULL;
 	gboolean local = TRUE;
@@ -467,7 +467,7 @@ PurpleXfer *silcpurple_ftp_new_xfer(Purp
 	purple_xfer_set_init_fnc(xfer->xfer, silcpurple_ftp_send);
 	purple_xfer_set_request_denied_fnc(xfer->xfer, silcpurple_ftp_request_denied);
 	purple_xfer_set_cancel_send_fnc(xfer->xfer, silcpurple_ftp_send_cancel);
-	xfer->xfer->data = xfer;
+	purple_xfer_set_protocol_data(xfer->xfer, xfer);
 
 	silc_free(clients);