pidgin/pidgin

make sure all the PurpleProtocolXfer parameters are named prplxfer

2017-11-26, Gary Kramlich
518362268798
Parents 33326576c72b
Children 98227c37cd17
make sure all the PurpleProtocolXfer parameters are named prplxfer
15 files changed, 38 insertions(+), 38 deletions(-)
  • +1 -1
    libpurple/protocols/bonjour/bonjour.c
  • +3 -3
    libpurple/protocols/bonjour/bonjour_ft.c
  • +2 -2
    libpurple/protocols/bonjour/bonjour_ft.h
  • +4 -4
    libpurple/protocols/gg/edisc.c
  • +3 -3
    libpurple/protocols/gg/edisc.h
  • +3 -3
    libpurple/protocols/irc/dcc_send.c
  • +2 -2
    libpurple/protocols/irc/irc.h
  • +1 -1
    libpurple/protocols/jabber/jabber.c
  • +3 -3
    libpurple/protocols/jabber/si.c
  • +2 -2
    libpurple/protocols/jabber/si.h
  • +4 -4
    libpurple/protocols/oscar/oscar.c
  • +3 -3
    libpurple/protocols/oscar/oscarcommon.h
  • +4 -4
    libpurple/protocols/sametime/sametime.c
  • +2 -2
    libpurple/protocols/silc/ft.c
  • +1 -1
    libpurple/protocols/silc/silc.c
    • --- a/libpurple/protocols/bonjour/bonjour.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/bonjour/bonjour.c Sun Nov 26 01:30:28 2017 -0600
    @@ -466,7 +466,7 @@
    }
    static gboolean
    -bonjour_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *connection, const char *who)
    +bonjour_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *connection, const char *who)
    {
    PurpleBuddy *buddy = purple_blist_find_buddy(purple_connection_get_account(connection), who);
    --- a/libpurple/protocols/bonjour/bonjour_ft.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Sun Nov 26 01:30:28 2017 -0600
    @@ -339,7 +339,7 @@
    }
    PurpleXfer *
    -bonjour_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +bonjour_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    PurpleXfer *xfer;
    XepXfer *xep_xfer;
    @@ -376,7 +376,7 @@
    }
    void
    -bonjour_send_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file)
    +bonjour_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file)
    {
    PurpleXfer *xfer;
    @@ -385,7 +385,7 @@
    purple_debug_info("bonjour", "Bonjour-send-file to=%s.\n", who);
    - xfer = bonjour_new_xfer(pxfer, gc, who);
    + xfer = bonjour_new_xfer(prplxfer, gc, who);
    if (file)
    purple_xfer_request_accepted(xfer, file);
    --- a/libpurple/protocols/bonjour/bonjour_ft.h Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/bonjour/bonjour_ft.h Sun Nov 26 01:30:28 2017 -0600
    @@ -60,7 +60,7 @@
    * @param gc The PurpleConnection handle.
    * @param who Who will we be sending it to?
    */
    -PurpleXfer *bonjour_new_xfer(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    +PurpleXfer *bonjour_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    /**
    * Send a file.
    @@ -69,7 +69,7 @@
    * @param who Who are we sending it to?
    * @param file What file? If NULL, user will choose after this call.
    */
    -void bonjour_send_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who, const char *file);
    +void bonjour_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file);
    void xep_si_parse(PurpleConnection *pc, PurpleXmlNode *packet, PurpleBuddy *pb);
    void
    --- a/libpurple/protocols/gg/edisc.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/gg/edisc.c Sun Nov 26 01:30:28 2017 -0600
    @@ -383,7 +383,7 @@
    static void ggp_edisc_xfer_send_done(PurpleHttpConnection *hc,
    PurpleHttpResponse *response, gpointer _xfer);
    -gboolean ggp_edisc_xfer_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *gc,
    +gboolean ggp_edisc_xfer_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc,
    const char *who)
    {
    PurpleBuddy *buddy;
    @@ -664,7 +664,7 @@
    ggp_edisc_xfer_error(xfer, _("Error while sending a file"));
    }
    -PurpleXfer * ggp_edisc_xfer_send_new(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +PurpleXfer * ggp_edisc_xfer_send_new(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    PurpleXfer *xfer;
    ggp_edisc_xfer *edisc_xfer;
    @@ -686,7 +686,7 @@
    return xfer;
    }
    -void ggp_edisc_xfer_send_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who,
    +void ggp_edisc_xfer_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who,
    const char *filename)
    {
    PurpleXfer *xfer;
    @@ -697,7 +697,7 @@
    /* Nothing interesting here, this code is common among protocols.
    * See ggp_edisc_xfer_send_new. */
    - xfer = ggp_edisc_xfer_send_new(pxfer, gc, who);
    + xfer = ggp_edisc_xfer_send_new(prplxfer, gc, who);
    if (filename)
    purple_xfer_request_accepted(xfer, filename);
    else
    --- a/libpurple/protocols/gg/edisc.h Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/gg/edisc.h Sun Nov 26 01:30:28 2017 -0600
    @@ -41,9 +41,9 @@
    const char *data);
    /* Sending a file. */
    -gboolean ggp_edisc_xfer_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    -void ggp_edisc_xfer_send_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who,
    +gboolean ggp_edisc_xfer_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    +void ggp_edisc_xfer_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who,
    const char *filename);
    -PurpleXfer * ggp_edisc_xfer_send_new(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    +PurpleXfer * ggp_edisc_xfer_send_new(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    #endif /* _GGP_EDISC_H */
    --- a/libpurple/protocols/irc/dcc_send.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/irc/dcc_send.c Sun Nov 26 01:30:28 2017 -0600
    @@ -359,7 +359,7 @@
    }
    -PurpleXfer *irc_dccsend_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who) {
    +PurpleXfer *irc_dccsend_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who) {
    PurpleXfer *xfer;
    struct irc_xfer_send_data *xd;
    @@ -387,8 +387,8 @@
    * buddy menu
    * It sets up the PurpleXfer struct and tells Purple to go ahead
    */
    -void irc_dccsend_send_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file) {
    - PurpleXfer *xfer = irc_dccsend_new_xfer(pxfer, gc, who);
    +void irc_dccsend_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file) {
    + PurpleXfer *xfer = irc_dccsend_new_xfer(prplxfer, gc, who);
    /* Perform the request */
    if (file)
    --- a/libpurple/protocols/irc/irc.h Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/irc/irc.h Sun Nov 26 01:30:28 2017 -0600
    @@ -237,7 +237,7 @@
    int irc_cmd_whois(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
    int irc_cmd_whowas(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
    -PurpleXfer *irc_dccsend_new_xfer(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    -void irc_dccsend_send_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who, const char *file);
    +PurpleXfer *irc_dccsend_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    +void irc_dccsend_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file);
    void irc_dccsend_recv(struct irc_conn *irc, const char *from, const char *msg);
    #endif /* _PURPLE_IRC_H */
    --- a/libpurple/protocols/jabber/jabber.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/jabber/jabber.c Sun Nov 26 01:30:28 2017 -0600
    @@ -3540,7 +3540,7 @@
    #endif
    }
    -gboolean jabber_can_receive_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +gboolean jabber_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    JabberStream *js = purple_connection_get_protocol_data(gc);
    --- a/libpurple/protocols/jabber/si.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/jabber/si.c Sun Nov 26 01:30:28 2017 -0600
    @@ -1618,7 +1618,7 @@
    }
    }
    -PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    JabberStream *js;
    @@ -1647,11 +1647,11 @@
    return xfer;
    }
    -void jabber_si_xfer_send(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file)
    +void jabber_si_xfer_send(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file)
    {
    PurpleXfer *xfer;
    - xfer = jabber_si_new_xfer(pxfer, gc, who);
    + xfer = jabber_si_new_xfer(prplxfer, gc, who);
    if (file)
    purple_xfer_request_accepted(xfer, file);
    --- a/libpurple/protocols/jabber/si.h Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/jabber/si.h Sun Nov 26 01:30:28 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(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    -void jabber_si_xfer_send(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who, const char *file);
    +PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    +void jabber_si_xfer_send(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file);
    void jabber_si_init(void);
    void jabber_si_uninit(void);
    --- a/libpurple/protocols/oscar/oscar.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/oscar/oscar.c Sun Nov 26 01:30:28 2017 -0600
    @@ -5257,7 +5257,7 @@
    * allowed to send a file to this user.
    */
    gboolean
    -oscar_can_receive_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +oscar_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    OscarData *od;
    PurpleAccount *account;
    @@ -5286,7 +5286,7 @@
    }
    PurpleXfer *
    -oscar_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    +oscar_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
    {
    PurpleXfer *xfer;
    OscarData *od;
    @@ -5320,11 +5320,11 @@
    * file is to be sent to a special someone.
    */
    void
    -oscar_send_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file)
    +oscar_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file)
    {
    PurpleXfer *xfer;
    - xfer = oscar_new_xfer(pxfer, gc, who);
    + xfer = oscar_new_xfer(prplxfer, gc, who);
    if (file != NULL)
    purple_xfer_request_accepted(xfer, file);
    --- a/libpurple/protocols/oscar/oscarcommon.h Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/oscar/oscarcommon.h Sun Nov 26 01:30:28 2017 -0600
    @@ -116,9 +116,9 @@
    const char *oscar_normalize(const PurpleAccount *account, const char *str);
    void oscar_set_icon(PurpleConnection *gc, PurpleImage *img);
    void oscar_remove_group(PurpleConnection *gc, PurpleGroup *group);
    -gboolean oscar_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    -void oscar_send_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who, const char *file);
    -PurpleXfer *oscar_new_xfer(PurpleProtocolXfer *xfer, PurpleConnection *gc, const char *who);
    +gboolean oscar_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    +void oscar_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file);
    +PurpleXfer *oscar_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
    gboolean oscar_offline_message(const PurpleBuddy *buddy);
    gssize oscar_get_max_message_size(PurpleConversation *conv);
    GList *oscar_get_actions(PurpleConnection *gc);
    --- a/libpurple/protocols/sametime/sametime.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/sametime/sametime.c Sun Nov 26 01:30:28 2017 -0600
    @@ -4941,7 +4941,7 @@
    }
    -static gboolean mw_protocol_can_receive_file(PurpleProtocolXfer *pxfer,
    +static gboolean mw_protocol_can_receive_file(PurpleProtocolXfer *prplxfer,
    PurpleConnection *gc,
    const char *who) {
    struct mwPurpleProtocolData *pd;
    @@ -5031,7 +5031,7 @@
    }
    -static PurpleXfer *mw_protocol_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who) {
    +static PurpleXfer *mw_protocol_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who) {
    PurpleAccount *acct;
    PurpleXfer *xfer;
    @@ -5047,11 +5047,11 @@
    return xfer;
    }
    -static void mw_protocol_send_file(PurpleProtocolXfer *pxfer,
    +static void mw_protocol_send_file(PurpleProtocolXfer *prplxfer,
    PurpleConnection *gc,
    const char *who, const char *file) {
    - PurpleXfer *xfer = mw_protocol_new_xfer(pxfer, gc, who);
    + PurpleXfer *xfer = mw_protocol_new_xfer(prplxfer, gc, who);
    if(file) {
    DEBUG_INFO("file != NULL\n");
    --- a/libpurple/protocols/silc/ft.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/silc/ft.c Sun Nov 26 01:30:28 2017 -0600
    @@ -441,7 +441,7 @@
    g_free(context);
    }
    -PurpleXfer *silcpurple_ftp_new_xfer(PurpleConnection *gc, const char *name)
    +PurpleXfer *silcpurple_ftp_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *name)
    {
    SilcPurple sg = purple_connection_get_protocol_data(gc);
    SilcClient client = sg->client;
    @@ -482,7 +482,7 @@
    return xfer->xfer;
    }
    -void silcpurple_ftp_send_file(PurpleConnection *gc, const char *name, const char *file)
    +void silcpurple_ftp_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *name, const char *file)
    {
    PurpleXfer *xfer = silcpurple_ftp_new_xfer(gc, name);
    --- a/libpurple/protocols/silc/silc.c Sat Nov 25 20:30:14 2017 -0600
    +++ b/libpurple/protocols/silc/silc.c Sun Nov 26 01:30:28 2017 -0600
    @@ -2283,7 +2283,7 @@
    }
    static void
    -silcpurple_protocol_xfer_iface_init(PurpleProtocolXferIface *xfer_iface)
    +silcpurple_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
    {
    xfer_iface->send = silcpurple_ftp_send_file;
    xfer_iface->new_xfer = silcpurple_ftp_new_xfer;