Mercurial > pidgin3 / changeset

--- a/libpurple/xfer.c	Fri Nov 24 01:47:01 2017 -0600
+++ b/libpurple/xfer.c	Sat Nov 25 20:30:14 2017 -0600
@@ -2488,55 +2488,55 @@
 }
 
 gboolean
-purple_protocol_xfer_can_receive(PurpleProtocolXfer *xfer,
+purple_protocol_xfer_can_receive(PurpleProtocolXfer *prplxfer,
                                  PurpleConnection *connection,
                                  const gchar *who
 ) {
 	PurpleProtocolXferInterface *iface = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_PROTOCOL_XFER(xfer), FALSE);
+	g_return_val_if_fail(PURPLE_IS_PROTOCOL_XFER(prplxfer), FALSE);
 	g_return_val_if_fail(PURPLE_IS_CONNECTION(connection), FALSE);
 	g_return_val_if_fail(who, FALSE);
 
-	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(xfer);
+	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(prplxfer);
 	if(iface &&  iface->can_receive)
-		return iface->can_receive(xfer, connection, who);
+		return iface->can_receive(prplxfer, connection, who);
 
 	return FALSE;
 }
 
 void
-purple_protocol_xfer_send(PurpleProtocolXfer *xfer,
+purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer,
                           PurpleConnection *connection,
                           const gchar *who,
                           const gchar *filename
 ) {
 	PurpleProtocolXferInterface *iface = NULL;
 
-	g_return_if_fail(PURPLE_IS_PROTOCOL_XFER(xfer));
+	g_return_if_fail(PURPLE_IS_PROTOCOL_XFER(prplxfer));
 	g_return_if_fail(PURPLE_IS_CONNECTION(connection));
 	g_return_if_fail(who);
 	g_return_if_fail(filename);
 
-	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(xfer);
+	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(prplxfer);
 	if(iface && iface->send)
-		iface->send(xfer, connection, who, filename);
+		iface->send(prplxfer, connection, who, filename);
 }
 
 PurpleXfer *
-purple_protocol_xfer_new_xfer(PurpleProtocolXfer *xfer,
+purple_protocol_xfer_new_xfer(PurpleProtocolXfer *prplxfer,
                               PurpleConnection *connection,
                               const gchar *who
 ) {
 	PurpleProtocolXferInterface *iface = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_PROTOCOL_XFER(xfer), FALSE);
+	g_return_val_if_fail(PURPLE_IS_PROTOCOL_XFER(prplxfer), FALSE);
 	g_return_val_if_fail(PURPLE_IS_CONNECTION(connection), FALSE);
 	g_return_val_if_fail(who, FALSE);
 
-	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(xfer);
+	iface = PURPLE_PROTOCOL_XFER_GET_IFACE(prplxfer);
 	if(iface && iface->new_xfer)
-		return iface->new_xfer(xfer, connection, who);
+		return iface->new_xfer(prplxfer, connection, who);
 
 	return NULL;
 }

--- a/libpurple/xfer.h	Fri Nov 24 01:47:01 2017 -0600
+++ b/libpurple/xfer.h	Sat Nov 25 20:30:14 2017 -0600
@@ -204,11 +204,11 @@
 	GTypeInterface parent_iface;
 
 	/*< public >*/
-	gboolean (*can_receive)(PurpleProtocolXfer *xfer, PurpleConnection *c, const gchar *who);
+	gboolean (*can_receive)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who);
 
-	void (*send)(PurpleProtocolXfer *xfer, PurpleConnection *c, const gchar *who, const gchar *filename);
+	void (*send)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who, const gchar *filename);
 
-	PurpleXfer *(*new_xfer)(PurpleProtocolXfer *xfer, PurpleConnection *c, const gchar *who);
+	PurpleXfer *(*new_xfer)(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who);
 };
 
 G_BEGIN_DECLS
@@ -988,7 +988,7 @@
 
 /**
  * purple_protocol_xfer_can_receive:
- * @xface: The #PurpleProtocolXfer implementer instance
+ * @prplxfer: The #PurpleProtocolXfer implementer instance
  * @connection: The #PurpleConnection that we're checking
  * @who: The user that we want to set a file transfer to.
  *
@@ -996,22 +996,22 @@
  *
  * Returns: TRUE on success, FALSE otherwise.
  */
-gboolean purple_protocol_xfer_can_receive(PurpleProtocolXfer *xfer, PurpleConnection *connection, const gchar *who);
+gboolean purple_protocol_xfer_can_receive(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who);
 
 /**
  * purple_protocol_xfer_send:
- * @xfer: The #PurpleProtocolXfer inmplementer instance
+ * @prplxfer: The #PurpleProtocolXfer inmplementer instance
  * @connection: The #PurpleConnection that we're checking
  * @who: The user that we want to set a file transfer to.
  * @filename: The name of the file to send.
  *
  * Sends @filename to @who.
  */
-void purple_protocol_xfer_send(PurpleProtocolXfer *xfer, PurpleConnection *connection, const gchar *who, const gchar *filename);
+void purple_protocol_xfer_send(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who, const gchar *filename);
 
 /**
  * purple_protocol_xfer_send:
- * @xfer: The #PurpleProtocolXfer implementer instance
+ * @prplxfer: The #PurpleProtocolXfer implementer instance
  * @connection: The #PurpleConnection that we're checking
  * @who: The user that we want to set a file transfer to.
  *
@@ -1019,7 +1019,7 @@
  *
  * Returns: A new #PurpleXfer instance.
  */
-PurpleXfer *purple_protocol_xfer_new_xfer(PurpleProtocolXfer *xfer, PurpleConnection *connection, const gchar *who);
+PurpleXfer *purple_protocol_xfer_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const gchar *who);
 
 G_END_DECLS