summaryrefslogtreecommitdiff
path: root/libpurple
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2023-03-17 00:41:38 -0500
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2023-03-17 00:41:38 -0500
commitd492e84c03fe66bd8f2466b0fa176c179261d831 (patch)
tree5a99475afc27fb14c3ea6ffdaff54eb00168fd72 /libpurple
parent5701ff4637926e7f04d9b1022082d887883dd9ca (diff)
downloadpidgin-d492e84c03fe66bd8f2466b0fa176c179261d831.tar.gz
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/
Diffstat (limited to 'libpurple')
-rw-r--r--libpurple/purpleprivate.h2
-rw-r--r--libpurple/purplerequestfield.c36
-rw-r--r--libpurple/purplerequestfield.h10
-rw-r--r--libpurple/purplerequestgroup.c10
-rw-r--r--libpurple/purplerequestpage.c25
5 files changed, 0 insertions, 83 deletions
diff --git a/libpurple/purpleprivate.h b/libpurple/purpleprivate.h
index afcd5f096e..8db11650a2 100644
--- a/libpurple/purpleprivate.h
+++ b/libpurple/purpleprivate.h
@@ -340,10 +340,8 @@ G_GNUC_INTERNAL void purple_account_set_enabled_plain(PurpleAccount *account, gb
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
diff --git a/libpurple/purplerequestfield.c b/libpurple/purplerequestfield.c
index 6652aab276..dd35db5aa2 100644
--- a/libpurple/purplerequestfield.c
+++ b/libpurple/purplerequestfield.c
@@ -50,7 +50,6 @@ enum {
PROP_REQUIRED,
PROP_FILLED,
PROP_VALID,
- PROP_IS_VALIDATABLE,
N_PROPERTIES,
};
static GParamSpec *properties[N_PROPERTIES] = {NULL, };
@@ -115,10 +114,6 @@ purple_request_field_get_property(GObject *obj, guint param_id, GValue *value,
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 @@ purple_request_field_class_init(PurpleRequestFieldClass *klass) {
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 @@ purple_request_field_set_validator(PurpleRequestField *field,
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;
diff --git a/libpurple/purplerequestfield.h b/libpurple/purplerequestfield.h
index 69447f5b02..90621154d8 100644
--- a/libpurple/purplerequestfield.h
+++ b/libpurple/purplerequestfield.h
@@ -227,16 +227,6 @@ gboolean purple_request_field_is_filled(PurpleRequestField *field);
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
diff --git a/libpurple/purplerequestgroup.c b/libpurple/purplerequestgroup.c
index c0d4d1120d..490ca7723d 100644
--- a/libpurple/purplerequestgroup.c
+++ b/libpurple/purplerequestgroup.c
@@ -240,16 +240,6 @@ _purple_request_group_set_field_required(PurpleRequestGroup *group,
}
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)
{
diff --git a/libpurple/purplerequestpage.c b/libpurple/purplerequestpage.c
index ab909697f0..d16a408295 100644
--- a/libpurple/purplerequestpage.c
+++ b/libpurple/purplerequestpage.c
@@ -39,8 +39,6 @@ struct _PurpleRequestPage {
GHashTable *fields;
GList *required_fields;
-
- GList *validated_fields;
};
enum {
@@ -140,7 +138,6 @@ purple_request_page_finalize(GObject *obj) {
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 @@ _purple_request_page_set_field_required(PurpleRequestPage *page,
}
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 @@ _purple_request_page_add_field(PurpleRequestPage *page,
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 @@ purple_request_page_add_group(PurpleRequestPage *page,
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);