pidgin/pidgin

Remove now-unused PurpleXferUiOps.destroy.

2019-12-22, Elliott Sales de Andrade
d26ef8ea193f
Parents 663b8a40dad5
Children 47129af2bd5e
Remove now-unused PurpleXferUiOps.destroy.

UI data is stored on GObjects and automatically destroyed, so this isn't
really needed as a UI op for *our* UIs. There will be a replacement soon
if needed by other UIs.
5 files changed, 3 insertions(+), 13 deletions(-)
  • +1 -0
    ChangeLog.API
  • +1 -2
    finch/gntxfer.c
  • +0 -7
    libpurple/xfer.c
  • +0 -2
    libpurple/xfer.h
  • +1 -2
    pidgin/gtkxfer.c
    • --- a/ChangeLog.API Sun Dec 22 16:35:25 2019 -0500
    +++ b/ChangeLog.API Sun Dec 22 21:00:23 2019 -0500
    @@ -492,6 +492,7 @@
    #PurpleXfer objects instead.
    * PurpleXferUiOps.data_not_sent. Use PurpleXfer::data-not-sent
    instead.
    + * PurpleXferUiOps.destroy
    * PurpleXferUiOps.ui_read. Use PurpleXfer::read-local instead.
    * PurpleXferUiOps.ui_write. Use PurpleXfer::write-local instead.
    * PurpleXferUiOps.update_progress. Use notify::progress on
    --- a/finch/gntxfer.c Sun Dec 22 16:35:25 2019 -0500
    +++ b/finch/gntxfer.c Sun Dec 22 21:00:23 2019 -0500
    @@ -509,8 +509,7 @@
    static PurpleXferUiOps ops =
    {
    - finch_xfer_new_xfer,
    - NULL
    + finch_xfer_new_xfer
    };
    /**************************************************************************
    --- a/libpurple/xfer.c Sun Dec 22 16:35:25 2019 -0500
    +++ b/libpurple/xfer.c Sun Dec 22 21:00:23 2019 -0500
    @@ -2097,7 +2097,6 @@
    {
    PurpleXfer *xfer = PURPLE_XFER(object);
    PurpleXferPrivate *priv = purple_xfer_get_instance_private(xfer);
    - PurpleXferUiOps *ui_ops;
    /* Close the file browser, if it's open */
    purple_request_close_with_handle(xfer);
    @@ -2106,12 +2105,6 @@
    purple_xfer_cancel_local(xfer);
    }
    - ui_ops = purple_xfer_get_ui_ops(xfer);
    -
    - if (ui_ops != NULL && ui_ops->destroy != NULL) {
    - ui_ops->destroy(xfer);
    - }
    -
    xfers = g_list_remove(xfers, xfer);
    g_free(priv->who);
    --- a/libpurple/xfer.h Sun Dec 22 16:35:25 2019 -0500
    +++ b/libpurple/xfer.h Sun Dec 22 21:00:23 2019 -0500
    @@ -91,7 +91,6 @@
    /**
    * PurpleXferUiOps:
    * @new_xfer: UI op that's called after a new transfer is created.
    - * @destroy: UI op that's called when a transfer is being destroyed.
    *
    * File transfer UI operations.
    *
    @@ -101,7 +100,6 @@
    struct _PurpleXferUiOps
    {
    void (*new_xfer)(PurpleXfer *xfer);
    - void (*destroy)(PurpleXfer *xfer);
    };
    /**
    --- a/pidgin/gtkxfer.c Sun Dec 22 16:35:25 2019 -0500
    +++ b/pidgin/gtkxfer.c Sun Dec 22 21:00:23 2019 -0500
    @@ -1007,8 +1007,7 @@
    static PurpleXferUiOps ops =
    {
    - pidgin_xfer_new_xfer,
    - NULL
    + pidgin_xfer_new_xfer
    };
    /**************************************************************************