qulogic/pidgin

fix up jabber for the xfer cleanups

2017-11-24, Gary Kramlich
c93c58dd6ce4
Parents 153c0c3bcced
Children e021679086dc
fix up jabber for the xfer cleanups
4 files changed, 7 insertions(+), 7 deletions(-)
  • +1 -1
    libpurple/protocols/jabber/jabber.c
  • +1 -1
    libpurple/protocols/jabber/jabber.h
  • +3 -3
    libpurple/protocols/jabber/si.c
  • +2 -2
    libpurple/protocols/jabber/si.h
    • --- a/libpurple/protocols/jabber/jabber.c Fri Nov 24 01:22:30 2017 -0600
    +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 24 01:36:19 2017 -0600
    @@ -3540,7 +3540,7 @@
    #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);
    --- a/libpurple/protocols/jabber/jabber.h Fri Nov 24 01:22:30 2017 -0600
    +++ b/libpurple/protocols/jabber/jabber.h Fri Nov 24 01:36:19 2017 -0600
    @@ -431,6 +431,6 @@
    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_ */
    --- a/libpurple/protocols/jabber/si.c Fri Nov 24 01:22:30 2017 -0600
    +++ b/libpurple/protocols/jabber/si.c Fri Nov 24 01:36:19 2017 -0600
    @@ -1618,7 +1618,7 @@
    }
    }
    -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 @@
    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);
    --- a/libpurple/protocols/jabber/si.h Fri Nov 24 01:22:30 2017 -0600
    +++ b/libpurple/protocols/jabber/si.h Fri Nov 24 01:36:19 2017 -0600
    @@ -32,8 +32,8 @@
    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);