pidgin/pidgin

Remove unused API from request fields

13 months ago, Elliott Sales de Andrade
a35df4578814
Parents e603d4381fe5
Children c9968cbf01d5
Remove unused API from request fields

The `GList` API is no longer used, as containers use the `GListModel` interface.

Fetching the group-from-field or page-from-group is no longer needed as previous users now process the field along with the group they were already using.

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/2363/
7 files changed, 6 insertions(+), 96 deletions(-)
  • +6 -5
    ChangeLog.API
  • +0 -3
    libpurple/purpleprivate.h
  • +0 -26
    libpurple/purplerequestfield.c
  • +0 -29
    libpurple/purplerequestgroup.c
  • +0 -12
    libpurple/purplerequestgroup.h
  • +0 -9
    libpurple/purplerequestpage.c
  • +0 -12
    libpurple/purplerequestpage.h
    • --- a/ChangeLog.API Mon Mar 20 22:59:41 2023 -0500
    +++ b/ChangeLog.API Mon Mar 20 23:01:54 2023 -0500
    @@ -229,11 +229,12 @@
    details.
    * PurpleRequestField is now a GObject. Please see the documentation
    for details.
    - * PurpleRequestFieldGroup is now a GObject, and renamed to
    - PurpleRequestGroup. Please see the documentation for
    - details.
    - * PurpleRequestFields is now a GObject, and renamed to
    - PurpleRequestPage. Please see the documentation for details.
    + * PurpleRequestFieldGroup is now a GObject, implements
    + GListModel, and is renamed to PurpleRequestGroup. Please see
    + the documentation for details.
    + * PurpleRequestFields is now a GObject, implements GListModel,
    + and is renamed to PurpleRequestPage. Please see the
    + documentation for details.
    * purple_request_field_get_field_type_hint renamed to
    purple_request_field_get_type_hint
    * purple_request_field_list_get_items now returns list of PurpleKeyValuePair
    --- a/libpurple/purpleprivate.h Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purpleprivate.h Mon Mar 20 23:01:54 2023 -0500
    @@ -338,9 +338,6 @@
    */
    G_GNUC_INTERNAL void purple_account_set_enabled_plain(PurpleAccount *account, gboolean enabled);
    -G_GNUC_INTERNAL void _purple_request_group_set_page(PurpleRequestGroup *group, PurpleRequestPage *fields);
    -G_GNUC_INTERNAL void _purple_request_field_set_group(PurpleRequestField *field, PurpleRequestGroup *group);
    -
    G_END_DECLS
    #endif /* PURPLE_PRIVATE_H */
    --- a/libpurple/purplerequestfield.c Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purplerequestfield.c Mon Mar 20 23:01:54 2023 -0500
    @@ -24,8 +24,6 @@
    #include "purpleprivate.h"
    typedef struct {
    - PurpleRequestGroup *group;
    -
    char *id;
    char *label;
    char *type_hint;
    @@ -316,19 +314,6 @@
    * Public API
    *****************************************************************************/
    void
    -_purple_request_field_set_group(PurpleRequestField *field,
    - PurpleRequestGroup *group)
    -{
    - PurpleRequestFieldPrivate *priv = NULL;
    -
    - g_return_if_fail(PURPLE_IS_REQUEST_FIELD(field));
    -
    - priv = purple_request_field_get_instance_private(field);
    -
    - priv->group = group;
    -}
    -
    -void
    purple_request_field_set_label(PurpleRequestField *field, const char *label)
    {
    PurpleRequestFieldPrivate *priv = NULL;
    @@ -409,17 +394,6 @@
    g_object_thaw_notify(G_OBJECT(field));
    }
    -PurpleRequestGroup *
    -purple_request_field_get_group(PurpleRequestField *field) {
    - PurpleRequestFieldPrivate *priv = NULL;
    -
    - g_return_val_if_fail(PURPLE_IS_REQUEST_FIELD(field), NULL);
    -
    - priv = purple_request_field_get_instance_private(field);
    -
    - return priv->group;
    -}
    -
    const char *
    purple_request_field_get_id(PurpleRequestField *field) {
    PurpleRequestFieldPrivate *priv = NULL;
    --- a/libpurple/purplerequestgroup.c Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purplerequestgroup.c Mon Mar 20 23:01:54 2023 -0500
    @@ -27,8 +27,6 @@
    struct _PurpleRequestGroup {
    GObject parent;
    - PurpleRequestPage *page;
    -
    char *title;
    GList *fields;
    @@ -221,15 +219,6 @@
    }
    void
    -_purple_request_group_set_page(PurpleRequestGroup *group,
    - PurpleRequestPage *page)
    -{
    - g_return_if_fail(PURPLE_IS_REQUEST_GROUP(group));
    -
    - group->page = page;
    -}
    -
    -void
    purple_request_group_add_field(PurpleRequestGroup *group,
    PurpleRequestField *field)
    {
    @@ -245,8 +234,6 @@
    g_signal_connect(field, "notify::valid",
    G_CALLBACK(purple_request_group_notify_field_cb), group);
    - _purple_request_field_set_group(field, group);
    -
    g_list_model_items_changed(G_LIST_MODEL(group), position, 0, 1);
    }
    @@ -258,22 +245,6 @@
    return group->title;
    }
    -GList *
    -purple_request_group_get_fields(PurpleRequestGroup *group)
    -{
    - g_return_val_if_fail(PURPLE_IS_REQUEST_GROUP(group), NULL);
    -
    - return group->fields;
    -}
    -
    -PurpleRequestPage *
    -purple_request_group_get_page(PurpleRequestGroup *group)
    -{
    - g_return_val_if_fail(PURPLE_IS_REQUEST_GROUP(group), NULL);
    -
    - return group->page;
    -}
    -
    gboolean
    purple_request_group_is_valid(PurpleRequestGroup *group) {
    g_return_val_if_fail(PURPLE_IS_REQUEST_GROUP(group), FALSE);
    --- a/libpurple/purplerequestgroup.h Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purplerequestgroup.h Mon Mar 20 23:01:54 2023 -0500
    @@ -84,18 +84,6 @@
    const char *purple_request_group_get_title(PurpleRequestGroup *group);
    /**
    - * purple_request_group_get_fields:
    - * @group: The group.
    - *
    - * Returns a list of all fields in a group.
    - *
    - * Returns: (element-type PurpleRequestField) (transfer none): The list of fields in the group.
    - *
    - * Since: 3.0.0
    - */
    -GList *purple_request_group_get_fields(PurpleRequestGroup *group);
    -
    -/**
    * purple_request_group_get_page:
    * @group: The group.
    *
    --- a/libpurple/purplerequestpage.c Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purplerequestpage.c Mon Mar 20 23:01:54 2023 -0500
    @@ -210,8 +210,6 @@
    position = g_list_length(page->groups);
    page->groups = g_list_append(page->groups, group);
    - _purple_request_group_set_page(group, page);
    -
    purple_request_page_notify_group_cb(G_OBJECT(group), NULL, page);
    g_signal_connect(group, "notify::valid",
    G_CALLBACK(purple_request_page_notify_group_cb), page);
    @@ -226,13 +224,6 @@
    g_list_model_items_changed(G_LIST_MODEL(page), position, 0, 1);
    }
    -GList *
    -purple_request_page_get_groups(PurpleRequestPage *page) {
    - g_return_val_if_fail(PURPLE_IS_REQUEST_PAGE(page), NULL);
    -
    - return page->groups;
    -}
    -
    gboolean
    purple_request_page_exists(PurpleRequestPage *page, const char *id) {
    g_return_val_if_fail(PURPLE_IS_REQUEST_PAGE(page), FALSE);
    --- a/libpurple/purplerequestpage.h Mon Mar 20 22:59:41 2023 -0500
    +++ b/libpurple/purplerequestpage.h Mon Mar 20 23:01:54 2023 -0500
    @@ -72,18 +72,6 @@
    void purple_request_page_add_group(PurpleRequestPage *page, PurpleRequestGroup *group);
    /**
    - * purple_request_page_get_groups:
    - * @page: The fields page.
    - *
    - * Returns a list of all groups in a field list.
    - *
    - * Returns: (element-type PurpleRequestGroup) (transfer none): A list of groups.
    - *
    - * Since: 3.0.0
    - */
    -GList *purple_request_page_get_groups(PurpleRequestPage *page);
    -
    -/**
    * purple_request_page_exists:
    * @page: The fields page.
    * @id: The ID of the field.