pidgin/pidgin

fix up oscar and sametime for the file transfer updates

2017-11-24, Gary Kramlich
e021679086dc
Parents c93c58dd6ce4
Children 33326576c72b
fix up oscar and sametime for the file transfer updates
3 files changed, 11 insertions(+), 11 deletions(-)
  • +4 -4
    libpurple/protocols/oscar/oscar.c
  • +3 -3
    libpurple/protocols/oscar/oscarcommon.h
  • +4 -4
    libpurple/protocols/sametime/sametime.c
    • --- a/libpurple/protocols/oscar/oscar.c Fri Nov 24 01:36:19 2017 -0600
    +++ b/libpurple/protocols/oscar/oscar.c Fri Nov 24 01:47:01 2017 -0600
    @@ -5257,7 +5257,7 @@
    * allowed to send a file to this user.
    */
    gboolean
    -oscar_can_receive_file(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who)
    +oscar_can_receive_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who)
    {
    OscarData *od;
    PurpleAccount *account;
    @@ -5286,7 +5286,7 @@
    }
    PurpleXfer *
    -oscar_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who)
    +oscar_new_xfer(PurpleProtocolXfer *pxfer, 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(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who, const char *file)
    +oscar_send_file(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who, const char *file)
    {
    PurpleXfer *xfer;
    - xfer = oscar_new_xfer(iface, gc, who);
    + xfer = oscar_new_xfer(pxfer, gc, who);
    if (file != NULL)
    purple_xfer_request_accepted(xfer, file);
    --- a/libpurple/protocols/oscar/oscarcommon.h Fri Nov 24 01:36:19 2017 -0600
    +++ b/libpurple/protocols/oscar/oscarcommon.h Fri Nov 24 01:47:01 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(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who);
    -void oscar_send_file(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who, const char *file);
    -PurpleXfer *oscar_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who);
    +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_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 Fri Nov 24 01:36:19 2017 -0600
    +++ b/libpurple/protocols/sametime/sametime.c Fri Nov 24 01:47:01 2017 -0600
    @@ -4941,7 +4941,7 @@
    }
    -static gboolean mw_protocol_can_receive_file(PurpleProtocolXferInterface *iface,
    +static gboolean mw_protocol_can_receive_file(PurpleProtocolXfer *pxfer,
    PurpleConnection *gc,
    const char *who) {
    struct mwPurpleProtocolData *pd;
    @@ -5031,7 +5031,7 @@
    }
    -static PurpleXfer *mw_protocol_new_xfer(PurpleProtocolXferInterface *iface, PurpleConnection *gc, const char *who) {
    +static PurpleXfer *mw_protocol_new_xfer(PurpleProtocolXfer *pxfer, PurpleConnection *gc, const char *who) {
    PurpleAccount *acct;
    PurpleXfer *xfer;
    @@ -5047,11 +5047,11 @@
    return xfer;
    }
    -static void mw_protocol_send_file(PurpleProtocolXferInterface *iface,
    +static void mw_protocol_send_file(PurpleProtocolXfer *pxfer,
    PurpleConnection *gc,
    const char *who, const char *file) {
    - PurpleXfer *xfer = mw_protocol_new_xfer(iface, gc, who);
    + PurpleXfer *xfer = mw_protocol_new_xfer(pxfer, gc, who);
    if(file) {
    DEBUG_INFO("file != NULL\n");