Convert PurpleRequestGroup into a GObject

And go through with the renaming of `PurpleRequestFieldGroup` to `PurpleRequestGroup`.

Also, this now implements `GListModel`, but nothing is yet updated to use that.

Testing Done:
Compiled, and opened Request Fields from Demo protocol.

Reviewed at https://reviews.imfreedom.org/r/2322/

4 files changed, 38 insertions, 38 deletions

diff --git a/finch/gntblist.c b/finch/gntblist.c
index c69ec15793..6d703fa3e7 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -583,29 +583,29 @@ finch_request_add_buddy(G_GNUC_UNUSED PurpleBuddyList *list,
                         const char *grp, const char *alias)
 {
 	PurpleRequestFields *fields = purple_request_fields_new();
-	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
+	PurpleRequestGroup *group = purple_request_group_new(NULL);
 	PurpleRequestField *field;
 
 	purple_request_fields_add_group(fields, group);
 
 	field = purple_request_field_string_new("screenname", _("Username"), username, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("alias", _("Alias (optional)"), alias, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("invite", _("Invite message (optional)"), NULL, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("group", _("Add in group"), grp, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 	purple_request_field_set_type_hint(field, "group");
 
 	field = purple_request_field_account_new("account", _("Account"), NULL);
 	purple_request_field_account_set_show_all(field, FALSE);
 	if (account)
 		purple_request_field_account_set_value(field, account);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	purple_request_fields(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."),
 			fields,
@@ -685,7 +685,7 @@ finch_request_add_chat(G_GNUC_UNUSED PurpleBuddyList *list,
                        const char *alias, const char *name)
 {
 	PurpleRequestFields *fields = purple_request_fields_new();
-	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
+	PurpleRequestGroup *group = purple_request_group_new(NULL);
 	PurpleRequestField *field;
 
 	purple_request_fields_add_group(fields, group);
@@ -694,20 +694,20 @@ finch_request_add_chat(G_GNUC_UNUSED PurpleBuddyList *list,
 	purple_request_field_account_set_show_all(field, FALSE);
 	if (account)
 		purple_request_field_account_set_value(field, account);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("name", _("Name"), name, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("alias", _("Alias"), alias, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_string_new("group", _("Group"), grp ? purple_group_get_name(grp) : NULL, FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 	purple_request_field_set_type_hint(field, "group");
 
 	field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	purple_request_fields(NULL, _("Add Chat"), NULL,
 			_("You can edit more information from the context menu later."),
@@ -985,7 +985,7 @@ chat_components_edit_ok(PurpleChat *chat, PurpleRequestFields *allfields)
 	GList *groups, *fields;
 
 	for (groups = purple_request_fields_get_groups(allfields); groups; groups = groups->next) {
-		fields = purple_request_field_group_get_fields(groups->data);
+		fields = purple_request_group_get_fields(groups->data);
 		for (; fields; fields = fields->next) {
 			PurpleRequestField *field = fields->data;
 			const char *id;
@@ -1010,7 +1010,7 @@ static void
 chat_components_edit(G_GNUC_UNUSED PurpleBlistNode *selected, PurpleChat *chat)
 {
 	PurpleRequestFields *fields = purple_request_fields_new();
-	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
+	PurpleRequestGroup *group = purple_request_group_new(NULL);
 	PurpleRequestField *field;
 	GList *parts, *iter;
 	PurpleProtocol *protocol;
@@ -1041,7 +1041,7 @@ chat_components_edit(G_GNUC_UNUSED PurpleBlistNode *selected, PurpleChat *chat)
 		if (pce->required)
 			purple_request_field_set_required(field, TRUE);
 
-		purple_request_field_group_add_field(group, field);
+		purple_request_group_add_field(group, field);
 		g_free(pce);
 	}
 
@@ -2535,18 +2535,18 @@ static void
 send_im_select(G_GNUC_UNUSED GntMenuItem *item, G_GNUC_UNUSED gpointer n)
 {
 	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group;
+	PurpleRequestGroup *group;
 	PurpleRequestField *field;
 
 	fields = purple_request_fields_new();
 
-	group = purple_request_field_group_new(NULL);
+	group = purple_request_group_new(NULL);
 	purple_request_fields_add_group(fields, group);
 
 	field = purple_request_field_string_new("screenname", _("Name"), NULL, FALSE);
 	purple_request_field_set_type_hint(field, "screenname");
 	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_account_new("account", _("Account"), NULL);
 	purple_request_field_set_type_hint(field, "account");
@@ -2554,7 +2554,7 @@ send_im_select(G_GNUC_UNUSED GntMenuItem *item, G_GNUC_UNUSED gpointer n)
 		(purple_connections_get_all() != NULL &&
 		 purple_connections_get_all()->next != NULL));
 	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	purple_request_fields(
 	        purple_blist_get_default(), _("New Instant Message"), NULL,
@@ -2611,17 +2611,17 @@ static void
 join_chat_select(G_GNUC_UNUSED GntMenuItem *item, G_GNUC_UNUSED gpointer n)
 {
 	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group;
+	PurpleRequestGroup *group;
 	PurpleRequestField *field;
 
 	fields = purple_request_fields_new();
 
-	group = purple_request_field_group_new(NULL);
+	group = purple_request_group_new(NULL);
 	purple_request_fields_add_group(fields, group);
 
 	field = purple_request_field_string_new("chat", _("Channel"), NULL, FALSE);
 	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_account_new("account", _("Account"), NULL);
 	purple_request_field_set_type_hint(field, "account");
@@ -2629,7 +2629,7 @@ join_chat_select(G_GNUC_UNUSED GntMenuItem *item, G_GNUC_UNUSED gpointer n)
 		(purple_connections_get_all() != NULL &&
 		 purple_connections_get_all()->next != NULL));
 	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
+	purple_request_group_add_field(group, field);
 
 	purple_request_fields(
 	        purple_blist_get_default(), _("Join a Chat"), NULL,
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
index 281514002c..1f54f8ca93 100644
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -535,7 +535,7 @@ process_pref_frame(PurplePluginPrefFrame *frame)
 {
 	PurpleRequestField *field;
 	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group = NULL;
+	PurpleRequestGroup *group = NULL;
 	GList *prefs;
 	GList *stringlist = NULL;
 	GntWidget *ret = NULL;
@@ -553,9 +553,9 @@ process_pref_frame(PurplePluginPrefFrame *frame)
 
 			if(purple_plugin_pref_get_pref_type(pref) == PURPLE_PLUGIN_PREF_INFO) {
 				field = purple_request_field_label_new("*", purple_plugin_pref_get_label(pref));
-				purple_request_field_group_add_field(group, field);
+				purple_request_group_add_field(group, field);
 			} else {
-				group = purple_request_field_group_new(label);
+				group = purple_request_group_new(label);
 				purple_request_fields_add_group(fields, group);
 			}
 			continue;
@@ -623,10 +623,10 @@ process_pref_frame(PurplePluginPrefFrame *frame)
 
 		if (field) {
 			if (group == NULL) {
-				group = purple_request_field_group_new(_("Preferences"));
+				group = purple_request_group_new(_("Preferences"));
 				purple_request_fields_add_group(fields, group);
 			}
-			purple_request_field_group_add_field(group, field);
+			purple_request_group_add_field(group, field);
 		}
 	}
 
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index 0ca2011b6f..ca6f2e2ee5 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -240,16 +240,16 @@ static void
 add_pref_group(PurpleRequestFields *fields, const char *title, Prefs *prefs)
 {
 	PurpleRequestField *field;
-	PurpleRequestFieldGroup *group;
+	PurpleRequestGroup *group;
 	int i;
 
-	group = purple_request_field_group_new(title);
+	group = purple_request_group_new(title);
 	purple_request_fields_add_group(fields, group);
 	for (i = 0; prefs[i].pref; i++)
 	{
 		field = get_pref_field(prefs + i);
 		if (field)
-			purple_request_field_group_add_field(group, field);
+			purple_request_group_add_field(group, field);
 	}
 }
 
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index ef71c4ab4f..5fb26f90da 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -292,8 +292,8 @@ request_fields_cb(GntWidget *button, PurpleRequestFields *fields)
 	 * here, although it can be done. */
 	for (list = purple_request_fields_get_groups(fields); list; list = list->next)
 	{
-		PurpleRequestFieldGroup *group = list->data;
-		GList *fields = purple_request_field_group_get_fields(group);
+		PurpleRequestGroup *group = list->data;
+		GList *fields = purple_request_group_get_fields(group);
 
 		for (; fields ; fields = fields->next)
 		{
@@ -625,10 +625,10 @@ finch_request_fields(const char *title, const char *primary,
 	gnt_box_set_fill(GNT_BOX(box), TRUE);
 	for (grlist = purple_request_fields_get_groups(allfields); grlist; grlist = grlist->next)
 	{
-		PurpleRequestFieldGroup *group = grlist->data;
-		GList *fields = purple_request_field_group_get_fields(group);
+		PurpleRequestGroup *group = grlist->data;
+		GList *fields = purple_request_group_get_fields(group);
 		GntWidget *hbox;
-		const char *title = purple_request_field_group_get_title(group);
+		const char *title = purple_request_group_get_title(group);
 
 		if (title)
 			gnt_box_add_widget(GNT_BOX(box),
@@ -861,8 +861,8 @@ finch_request_save_in_prefs(G_GNUC_UNUSED gpointer data,
 {
 	GList *list;
 	for (list = purple_request_fields_get_groups(allfields); list; list = list->next) {
-		PurpleRequestFieldGroup *group = list->data;
-		GList *fields = purple_request_field_group_get_fields(group);
+		PurpleRequestGroup *group = list->data;
+		GList *fields = purple_request_group_get_fields(group);
 
 		for (; fields ; fields = fields->next) {
 			PurpleRequestField *field = fields->data;