pidgin/pidgin

Remove purple_callback_set_zero.

2020-10-07, Elliott Sales de Andrade
5f512eb3857f
Parents a144fe8ec06f
Children aa0d59a5c23d
Remove purple_callback_set_zero.

There's only one use now that PurplePluginInfo->ui_data is gone.

Testing Done:
Compile.

Reviewed at https://reviews.imfreedom.org/r/148/
3 files changed, 8 insertions(+), 22 deletions(-)
  • +8 -3
    libpurple/protocols/gg/multilogon.c
  • +0 -9
    libpurple/util.c
  • +0 -10
    libpurple/util.h
    • --- a/libpurple/protocols/gg/multilogon.c Wed Oct 07 01:14:43 2020 -0500
    +++ b/libpurple/protocols/gg/multilogon.c Wed Oct 07 02:07:56 2020 -0500
    @@ -200,6 +200,13 @@
    purple_request_datasheet_record_get_datasheet(rec), key);
    }
    +static void
    +ggp_multilogin_close_request(ggp_multilogon_session_data *mldata)
    +{
    + mldata->sheet_handle = NULL;
    + mldata->dialog_handle = NULL;
    +}
    +
    void
    ggp_multilogon_dialog(PurpleConnection *gc)
    {
    @@ -248,7 +255,5 @@
    mldata->dialog_handle = dialog_handle;
    purple_request_add_close_notify(dialog_handle,
    - purple_callback_set_zero, &mldata->sheet_handle);
    - purple_request_add_close_notify(dialog_handle,
    - purple_callback_set_zero, &mldata->dialog_handle);
    + (GDestroyNotify)ggp_multilogin_close_request, mldata);
    }
    --- a/libpurple/util.c Wed Oct 07 01:14:43 2020 -0500
    +++ b/libpurple/util.c Wed Oct 07 02:07:56 2020 -0500
    @@ -3606,15 +3606,6 @@
    return g_string_free(string, FALSE);
    }
    -void purple_callback_set_zero(gpointer data)
    -{
    - gpointer *ptr = data;
    -
    - g_return_if_fail(ptr != NULL);
    -
    - *ptr = NULL;
    -}
    -
    GValue *
    purple_value_new(GType type)
    {
    --- a/libpurple/util.h Wed Oct 07 01:14:43 2020 -0500
    +++ b/libpurple/util.h Wed Oct 07 02:07:56 2020 -0500
    @@ -1237,16 +1237,6 @@
    const char *purple_escape_filename(const char *str);
    /**
    - * purple_callback_set_zero:
    - * @data: A pointer to variable, which should be set to NULL.
    - *
    - * Sets given pointer to NULL.
    - *
    - * Function designed to be used as a GDestroyNotify callback.
    - */
    -void purple_callback_set_zero(gpointer data);
    -
    -/**
    * purple_value_new:
    * @type: The type of data to be held by the GValue
    *