# HG changeset patch
# User Mike Ruprecht <cmaiku@gmail.com>
# Date 1525389441 18000
# Node ID 6a56e13668090682c5b4e451ad1a95a945cb69e6
# Parent  80586ad5c5a45b34a1e198b6705c39e38cf263e5
xfer: Rename PurpleProtocolXferInterface.send() to send_file()

With the addition of PurpleProtocolXferInterface, building in Windows
fails due to the redefinition of send() as wpurple_send(). Since a
lot of the prpls already call it this their implementations, this
patch renames it to send_file(). This fixes building on Windows
again.

diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/bonjour/bonjour.c	Thu May 03 18:17:21 2018 -0500
@@ -702,7 +702,7 @@
 bonjour_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
 	xfer_iface->can_receive = bonjour_can_receive_file;
-	xfer_iface->send        = bonjour_send_file;
+	xfer_iface->send_file   = bonjour_send_file;
 	xfer_iface->new_xfer    = bonjour_new_xfer;
 }
 
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/gg/gg.c	Thu May 03 18:17:21 2018 -0500
@@ -1074,7 +1074,7 @@
 ggp_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
 	xfer_iface->can_receive = ggp_edisc_xfer_can_receive_file;
-	xfer_iface->send        = ggp_edisc_xfer_send_file;
+	xfer_iface->send_file   = ggp_edisc_xfer_send_file;
 	xfer_iface->new_xfer    = ggp_edisc_xfer_send_new;
 }
 
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/irc/irc.c	Thu May 03 18:17:21 2018 -0500
@@ -920,8 +920,8 @@
 static void
 irc_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
-	xfer_iface->send     = irc_dccsend_send_file;
-	xfer_iface->new_xfer = irc_dccsend_new_xfer;
+	xfer_iface->send_file = irc_dccsend_send_file;
+	xfer_iface->new_xfer  = irc_dccsend_new_xfer;
 }
 
 PURPLE_DEFINE_TYPE_EXTENDED(
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/jabber/jabber.c	Thu May 03 18:17:21 2018 -0500
@@ -4185,7 +4185,7 @@
 jabber_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
 	xfer_iface->can_receive = jabber_can_receive_file;
-	xfer_iface->send        = jabber_si_xfer_send;
+	xfer_iface->send_file   = jabber_si_xfer_send;
 	xfer_iface->new_xfer    = jabber_si_new_xfer;
 }
 
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/oscar/oscar.c	Thu May 03 18:17:21 2018 -0500
@@ -5763,7 +5763,7 @@
 oscar_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
 	xfer_iface->can_receive = oscar_can_receive_file;
-	xfer_iface->send        = oscar_send_file;
+	xfer_iface->send_file   = oscar_send_file;
 	xfer_iface->new_xfer    = oscar_new_xfer;
 }
 
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/sametime/sametime.c	Thu May 03 18:17:21 2018 -0500
@@ -5576,7 +5576,7 @@
 mw_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
   xfer_iface->can_receive = mw_protocol_can_receive_file;
-  xfer_iface->send        = mw_protocol_send_file;
+  xfer_iface->send_file   = mw_protocol_send_file;
   xfer_iface->new_xfer    = mw_protocol_new_xfer;
 }
 
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/protocols/silc/silc.c	Thu May 03 18:17:21 2018 -0500
@@ -2255,8 +2255,8 @@
 static void
 silcpurple_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
 {
-	xfer_iface->send     = silcpurple_ftp_send_file;
-	xfer_iface->new_xfer = silcpurple_ftp_new_xfer;
+	xfer_iface->send_file = silcpurple_ftp_send_file;
+	xfer_iface->new_xfer  = silcpurple_ftp_new_xfer;
 }
 
 PURPLE_DEFINE_TYPE_EXTENDED(
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/server.c
--- a/libpurple/server.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/server.c	Thu May 03 18:17:21 2018 -0500
@@ -900,7 +900,8 @@
 			PurpleProtocolXfer *xfer = PURPLE_PROTOCOL_XFER(protocol);
 
 			if(purple_protocol_xfer_can_receive(xfer, gc, who)) {
-				purple_protocol_xfer_send(xfer, gc, who, file);
+				purple_protocol_xfer_send_file(xfer,
+						gc, who, file);
 			}
 		}
 	}
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/tests/test_protocol_xfer.c
--- a/libpurple/tests/test_protocol_xfer.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/tests/test_protocol_xfer.c	Thu May 03 18:17:21 2018 -0500
@@ -53,7 +53,7 @@
 }
 
 static void
-test_purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who, const gchar *filename) {
+test_purple_protocol_xfer_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who, const gchar *filename) {
 	TestPurpleProtocolXfer *test_xfer = (TestPurpleProtocolXfer *)prplxfer;
 
 	test_xfer->send_called = TRUE;
@@ -72,7 +72,7 @@
 static void
 test_purple_protocol_xfer_iface_init(PurpleProtocolXferInterface *iface) {
 	iface->can_receive = test_purple_protocol_xfer_can_receive;
-	iface->send = test_purple_protocol_xfer_send;
+	iface->send_file = test_purple_protocol_xfer_send_file;
 	iface->new_xfer = test_purple_protocol_xfer_new_xfer;
 }
 
@@ -127,12 +127,12 @@
 }
 
 static void
-test_purple_protocol_xfer_send_func(void) {
+test_purple_protocol_xfer_send_file_func(void) {
 	TestPurpleProtocolXfer *prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL);
 	PurpleAccount *a = purple_account_new("prpl-xfer-send", "prpl-xfer");
 	PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
 
-	purple_protocol_xfer_send(PURPLE_PROTOCOL_XFER(prplxfer), c, "foo", "somefile");
+	purple_protocol_xfer_send_file(PURPLE_PROTOCOL_XFER(prplxfer), c, "foo", "somefile");
 	g_assert_true(prplxfer->send_called);
 }
 
@@ -168,8 +168,8 @@
 	);
 
 	g_test_add_func(
-		"/protocol-xfer/send",
-		test_purple_protocol_xfer_send_func
+		"/protocol-xfer/send-file",
+		test_purple_protocol_xfer_send_file_func
 	);
 
 	g_test_add_func(
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/xfer.c
--- a/libpurple/xfer.c	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/xfer.c	Thu May 03 18:17:21 2018 -0500
@@ -2508,10 +2508,10 @@
 }
 
 void
-purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer,
-                          PurpleConnection *connection,
-                          const gchar *who,
-                          const gchar *filename
+purple_protocol_xfer_send_file(PurpleProtocolXfer *prplxfer,
+                               PurpleConnection *connection,
+                               const gchar *who,
+                               const gchar *filename
 ) {
 	PurpleProtocolXferInterface *iface = NULL;
 
@@ -2521,8 +2521,8 @@
 	g_return_if_fail(filename);
 
 	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(prplxfer);
-	if(iface && iface->send)
-		iface->send(prplxfer, connection, who, filename);
+	if(iface && iface->send_file)
+		iface->send_file(prplxfer, connection, who, filename);
 }
 
 PurpleXfer *
diff -r 80586ad5c5a4 -r 6a56e1366809 libpurple/xfer.h
--- a/libpurple/xfer.h	Tue May 01 16:32:13 2018 -0400
+++ b/libpurple/xfer.h	Thu May 03 18:17:21 2018 -0500
@@ -206,7 +206,7 @@
 	/*< public >*/
 	gboolean (*can_receive)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who);
 
-	void (*send)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who, const gchar *filename);
+	void (*send_file)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who, const gchar *filename);
 
 	PurpleXfer *(*new_xfer)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who);
 };
@@ -999,7 +999,7 @@
 gboolean purple_protocol_xfer_can_receive(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who);
 
 /**
- * purple_protocol_xfer_send:
+ * purple_protocol_xfer_send_file:
  * @prplxfer: The #PurpleProtocolXfer implementer instance
  * @connection: The #PurpleConnection that we're checking
  * @who: The user that we want to set a file transfer to.
@@ -1007,7 +1007,7 @@
  *
  * Sends @filename to @who.
  */
-void purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who, const gchar *filename);
+void purple_protocol_xfer_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who, const gchar *filename);
 
 /**
  * purple_protocol_xfer_send:
diff -r 80586ad5c5a4 -r 6a56e1366809 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue May 01 16:32:13 2018 -0400
+++ b/pidgin/gtkutils.c	Thu May 03 18:17:21 2018 -0500
@@ -1475,7 +1475,7 @@
 		if(iface->can_receive) {
 			ft = purple_protocol_xfer_can_receive(protocol, gc, who);
 		} else {
-			ft = (iface->send) ? TRUE : FALSE;
+			ft = (iface->send_file) ? TRUE : FALSE;
 		}
 	}