diff options
author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2023-03-20 23:01:54 -0500 |
---|---|---|
committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2023-03-20 23:01:54 -0500 |
commit | e11dd1f2dd8b2325bbc37f6e20841635ce1cb847 (patch) | |
tree | 2a7033882494f252d3a57f7f3ea333da8de6305e | |
parent | b1d3c6a83f847d9e94842f1adc6d8a6e4608b337 (diff) | |
download | pidgin-e11dd1f2dd8b2325bbc37f6e20841635ce1cb847.tar.gz |
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/
-rw-r--r-- | ChangeLog.API | 11 | ||||
-rw-r--r-- | libpurple/purpleprivate.h | 3 | ||||
-rw-r--r-- | libpurple/purplerequestfield.c | 26 | ||||
-rw-r--r-- | libpurple/purplerequestgroup.c | 29 | ||||
-rw-r--r-- | libpurple/purplerequestgroup.h | 12 | ||||
-rw-r--r-- | libpurple/purplerequestpage.c | 9 | ||||
-rw-r--r-- | libpurple/purplerequestpage.h | 12 |
7 files changed, 6 insertions, 96 deletions
diff --git a/ChangeLog.API b/ChangeLog.API index 414887ed8f..8d5b457c8b 100644 --- a/ChangeLog.API +++ b/ChangeLog.API @@ -229,11 +229,12 @@ version 3.0.0 (??/??/????): 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 diff --git a/libpurple/purpleprivate.h b/libpurple/purpleprivate.h index eb8d2242f4..701dfb5118 100644 --- a/libpurple/purpleprivate.h +++ b/libpurple/purpleprivate.h @@ -338,9 +338,6 @@ void purple_whiteboard_manager_shutdown(void); */ 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 */ diff --git a/libpurple/purplerequestfield.c b/libpurple/purplerequestfield.c index 3e95068137..3b1ae6ac67 100644 --- a/libpurple/purplerequestfield.c +++ b/libpurple/purplerequestfield.c @@ -24,8 +24,6 @@ #include "purpleprivate.h" typedef struct { - PurpleRequestGroup *group; - char *id; char *label; char *type_hint; @@ -316,19 +314,6 @@ purple_request_field_class_init(PurpleRequestFieldClass *klass) { * 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 @@ purple_request_field_set_required(PurpleRequestField *field, gboolean required) 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; diff --git a/libpurple/purplerequestgroup.c b/libpurple/purplerequestgroup.c index cce466907b..21bb48db46 100644 --- a/libpurple/purplerequestgroup.c +++ b/libpurple/purplerequestgroup.c @@ -27,8 +27,6 @@ struct _PurpleRequestGroup { GObject parent; - PurpleRequestPage *page; - char *title; GList *fields; @@ -221,15 +219,6 @@ purple_request_group_new(const char *title) { } 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 @@ purple_request_group_add_field(PurpleRequestGroup *group, 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 @@ purple_request_group_get_title(PurpleRequestGroup *group) 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); diff --git a/libpurple/purplerequestgroup.h b/libpurple/purplerequestgroup.h index 2f9aade7db..9139610291 100644 --- a/libpurple/purplerequestgroup.h +++ b/libpurple/purplerequestgroup.h @@ -84,18 +84,6 @@ void purple_request_group_add_field(PurpleRequestGroup *group, PurpleRequestFiel 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. * diff --git a/libpurple/purplerequestpage.c b/libpurple/purplerequestpage.c index f82d8c5d87..9aee11407c 100644 --- a/libpurple/purplerequestpage.c +++ b/libpurple/purplerequestpage.c @@ -210,8 +210,6 @@ purple_request_page_add_group(PurpleRequestPage *page, 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 @@ purple_request_page_add_group(PurpleRequestPage *page, 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); diff --git a/libpurple/purplerequestpage.h b/libpurple/purplerequestpage.h index 851fd72c83..df51757c7a 100644 --- a/libpurple/purplerequestpage.h +++ b/libpurple/purplerequestpage.h @@ -72,18 +72,6 @@ PurpleRequestPage *purple_request_page_new(void); 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. |