pidgin/pidgin

Remove tracking of whether a field is validatable

13 months ago, Elliott Sales de Andrade
f012db35bbc5
Parents 2bcdf415a79d
Children 2557742988dc
Remove tracking of whether a field is validatable

This is all handled by properties and `notify` signals now.

Nothing reads this state any more.

Testing Done:
Compiled and ran `ninja test`.

Reviewed at https://reviews.imfreedom.org/r/2349/
5 files changed, 0 insertions(+), 83 deletions(-)
  • +0 -2
    libpurple/purpleprivate.h
  • +0 -36
    libpurple/purplerequestfield.c
  • +0 -10
    libpurple/purplerequestfield.h
  • +0 -10
    libpurple/purplerequestgroup.c
  • +0 -25
    libpurple/purplerequestpage.c
    • --- a/libpurple/purpleprivate.h Thu Mar 16 22:50:08 2023 -0500
    +++ b/libpurple/purpleprivate.h Fri Mar 17 00:41:38 2023 -0500
    @@ -340,10 +340,8 @@
    G_GNUC_INTERNAL void _purple_request_page_add_field(PurpleRequestPage *fields, PurpleRequestField *field);
    G_GNUC_INTERNAL void _purple_request_page_set_field_required(PurpleRequestPage *fields, PurpleRequestField *field, gboolean required);
    -G_GNUC_INTERNAL void _purple_request_page_set_field_validator(PurpleRequestPage *fields, PurpleRequestField *field, gboolean validator);
    G_GNUC_INTERNAL void _purple_request_group_set_page(PurpleRequestGroup *group, PurpleRequestPage *fields);
    G_GNUC_INTERNAL void _purple_request_group_set_field_required(PurpleRequestGroup *group, PurpleRequestField *field, gboolean required);
    -G_GNUC_INTERNAL void _purple_request_group_set_field_validator(PurpleRequestGroup *group, PurpleRequestField *field, gboolean validator);
    G_GNUC_INTERNAL void _purple_request_field_set_group(PurpleRequestField *field, PurpleRequestGroup *group);
    G_END_DECLS
    --- a/libpurple/purplerequestfield.c Thu Mar 16 22:50:08 2023 -0500
    +++ b/libpurple/purplerequestfield.c Fri Mar 17 00:41:38 2023 -0500
    @@ -50,7 +50,6 @@
    PROP_REQUIRED,
    PROP_FILLED,
    PROP_VALID,
    - PROP_IS_VALIDATABLE,
    N_PROPERTIES,
    };
    static GParamSpec *properties[N_PROPERTIES] = {NULL, };
    @@ -115,10 +114,6 @@
    g_value_set_boolean(value,
    purple_request_field_is_valid(field, NULL));
    break;
    - case PROP_IS_VALIDATABLE:
    - g_value_set_boolean(value,
    - purple_request_field_is_validatable(field));
    - break;
    default:
    G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
    break;
    @@ -314,19 +309,6 @@
    TRUE,
    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
    - /**
    - * PurpleRequestField:is-validatable:
    - *
    - * Whether the field can be validated by the requestor.
    - *
    - * Since: 3.0.0
    - */
    - properties[PROP_IS_VALIDATABLE] = g_param_spec_boolean(
    - "is-validatable", "is-validatable",
    - "Whether the field can be validated by the requestor.",
    - FALSE,
    - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
    -
    g_object_class_install_properties(obj_class, N_PROPERTIES, properties);
    }
    @@ -545,28 +527,10 @@
    g_closure_set_marshal(priv->validator, g_cclosure_marshal_generic);
    }
    - if(PURPLE_IS_REQUEST_GROUP(priv->group)) {
    - _purple_request_group_set_field_validator(priv->group, field,
    - validator != NULL);
    - }
    -
    - g_object_notify_by_pspec(G_OBJECT(field), properties[PROP_IS_VALIDATABLE]);
    g_object_notify_by_pspec(G_OBJECT(field), properties[PROP_VALID]);
    }
    gboolean
    -purple_request_field_is_validatable(PurpleRequestField *field)
    -{
    - PurpleRequestFieldPrivate *priv = NULL;
    -
    - g_return_val_if_fail(PURPLE_IS_REQUEST_FIELD(field), FALSE);
    -
    - priv = purple_request_field_get_instance_private(field);
    -
    - return priv->validator != NULL;
    -}
    -
    -gboolean
    purple_request_field_is_valid(PurpleRequestField *field, gchar **errmsg)
    {
    PurpleRequestFieldClass *klass = NULL;
    --- a/libpurple/purplerequestfield.h Thu Mar 16 22:50:08 2023 -0500
    +++ b/libpurple/purplerequestfield.h Fri Mar 17 00:41:38 2023 -0500
    @@ -227,16 +227,6 @@
    void purple_request_field_set_validator(PurpleRequestField *field, PurpleRequestFieldValidator validator, gpointer user_data, GDestroyNotify destroy_data);
    /**
    - * purple_request_field_is_validatable:
    - * @field: The field.
    - *
    - * Returns whether or not field has validator set.
    - *
    - * Returns: TRUE if the field has validator, or FALSE.
    - */
    -gboolean purple_request_field_is_validatable(PurpleRequestField *field);
    -
    -/**
    * purple_request_field_is_valid:
    * @field: The field.
    * @errmsg: (nullable) (optional) (out): If non-%NULL, the memory area, where
    --- a/libpurple/purplerequestgroup.c Thu Mar 16 22:50:08 2023 -0500
    +++ b/libpurple/purplerequestgroup.c Fri Mar 17 00:41:38 2023 -0500
    @@ -240,16 +240,6 @@
    }
    void
    -_purple_request_group_set_field_validator(PurpleRequestGroup *group,
    - PurpleRequestField *field,
    - gboolean validator)
    -{
    - g_return_if_fail(PURPLE_IS_REQUEST_GROUP(group));
    -
    - _purple_request_page_set_field_validator(group->page, field, validator);
    -}
    -
    -void
    purple_request_group_add_field(PurpleRequestGroup *group,
    PurpleRequestField *field)
    {
    --- a/libpurple/purplerequestpage.c Thu Mar 16 22:50:08 2023 -0500
    +++ b/libpurple/purplerequestpage.c Fri Mar 17 00:41:38 2023 -0500
    @@ -39,8 +39,6 @@
    GHashTable *fields;
    GList *required_fields;
    -
    - GList *validated_fields;
    };
    enum {
    @@ -140,7 +138,6 @@
    g_list_free_full(page->groups, g_object_unref);
    g_clear_pointer(&page->invalid_groups, g_hash_table_destroy);
    g_list_free(page->required_fields);
    - g_list_free(page->validated_fields);
    g_hash_table_destroy(page->fields);
    G_OBJECT_CLASS(purple_request_page_parent_class)->finalize(obj);
    @@ -198,19 +195,6 @@
    }
    void
    -_purple_request_page_set_field_validator(PurpleRequestPage *page,
    - PurpleRequestField *field,
    - gboolean validator)
    -{
    - g_return_if_fail(PURPLE_IS_REQUEST_PAGE(page));
    -
    - page->validated_fields = g_list_remove(page->validated_fields, field);
    - if(validator) {
    - page->validated_fields = g_list_append(page->validated_fields, field);
    - }
    -}
    -
    -void
    _purple_request_page_add_field(PurpleRequestPage *page,
    PurpleRequestField *field)
    {
    @@ -222,10 +206,6 @@
    if(purple_request_field_is_required(field)) {
    page->required_fields = g_list_append(page->required_fields, field);
    }
    -
    - if(purple_request_field_is_validatable(field)) {
    - page->validated_fields = g_list_append(page->validated_fields, field);
    - }
    }
    void
    @@ -262,11 +242,6 @@
    page->required_fields = g_list_append(page->required_fields,
    field);
    }
    -
    - if (purple_request_field_is_validatable(field)) {
    - page->validated_fields = g_list_append(page->validated_fields,
    - field);
    - }
    }
    g_list_model_items_changed(G_LIST_MODEL(page), position, 0, 1);