summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2017-11-24 01:36:19 -0600
committerGary Kramlich <grim@reaperworld.com>2017-11-24 01:36:19 -0600
commitd0129ca3483168266e09f183bee7136773d609b1 (patch)
treed07c243e26b2e6aa1e7f19a778439d2d44ebd8c9
parent65f6484f1faa014fa9d8384426581ce857c2ebdc (diff)
downloadpidgin-d0129ca3483168266e09f183bee7136773d609b1.tar.gz
fix up jabber for the xfer cleanups
-rw-r--r--libpurple/protocols/jabber/jabber.c2
-rw-r--r--libpurple/protocols/jabber/jabber.h2
-rw-r--r--libpurple/protocols/jabber/si.c6
-rw-r--r--libpurple/protocols/jabber/si.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index b1263712a7..9d6da0c899 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -3540,7 +3540,7 @@ PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who)
#endif
}
-gboolean jabber_can_receive_file(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who)
+gboolean jabber_can_receive_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
{
JabberStream *js = purple_connection_get_protocol_data(gc);
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 8967e0e8d3..4c426dc42c 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -431,6 +431,6 @@ gboolean jabber_video_enabled(JabberStream *js, const char *unused);
gboolean jabber_initiate_media(PurpleAccount *account, const char *who,
PurpleMediaSessionType type);
PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
-gboolean jabber_can_receive_file(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const gchar *who);
+gboolean jabber_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const gchar *who);
#endif /* PURPLE_JABBER_H_ */
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index e97a8a0014..b2c3353ed5 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -1618,7 +1618,7 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
}
}
-PurpleXfer *jabber_si_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who)
+PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
{
JabberStream *js;
@@ -1647,11 +1647,11 @@ PurpleXfer *jabber_si_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnect
return xfer;
}
-void jabber_si_xfer_send(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who, const char *file)
+void jabber_si_xfer_send(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file)
{
PurpleXfer *xfer;
- xfer = jabber_si_new_xfer(iface, gc, who);
+ xfer = jabber_si_new_xfer(pxfer, gc, who);
if (file)
purple_xfer_request_accepted(xfer, file);
diff --git a/libpurple/protocols/jabber/si.h b/libpurple/protocols/jabber/si.h
index 32331f6bac..29c3667f90 100644
--- a/libpurple/protocols/jabber/si.h
+++ b/libpurple/protocols/jabber/si.h
@@ -32,8 +32,8 @@ void jabber_bytestreams_parse(JabberStream *js, const char *from,
JabberIqType type, const char *id, PurpleXmlNode *query);
void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
const char *id, PurpleXmlNode *si);
-PurpleXfer *jabber_si_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who);
-void jabber_si_xfer_send(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who, const char *file);
+PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
+void jabber_si_xfer_send(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who, const char *file);
void jabber_si_init(void);
void jabber_si_uninit(void);