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/

3 files changed, 21 insertions, 21 deletions

diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index d523376871..f5f047c5f8 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -86,19 +86,19 @@ void
 pidgin_dialogs_im(void)
 {
 	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_set_validator(field, pidgin_dialogs_im_name_validator, fields);
-	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");
@@ -106,7 +106,7 @@ pidgin_dialogs_im(void)
 		(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,
@@ -161,18 +161,18 @@ void
 pidgin_dialogs_info(void)
 {
 	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");
@@ -180,7 +180,7 @@ pidgin_dialogs_info(void)
 		(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(), _("Get User Info"), NULL,
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index d55e5b326c..d91e868f8f 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -225,12 +225,12 @@ static void
 req_field_changed_common(G_GNUC_UNUSED GtkWidget *widget,
                          PurpleRequestField *field)
 {
-	PurpleRequestFieldGroup *group;
+	PurpleRequestGroup *group;
 	PurpleRequestFields *fields;
 	PidginRequestData *req_data;
 
 	group = purple_request_field_get_group(field);
-	fields = purple_request_field_group_get_fields_list(group);
+	fields = purple_request_group_get_fields_list(group);
 	req_data = purple_request_fields_get_ui_data(fields);
 
 	gtk_widget_set_sensitive(req_data->ok_button,
@@ -1073,8 +1073,8 @@ setup_entry_field(GtkWidget *entry, PurpleRequestField *field)
 	{
 		if (g_str_has_prefix(type_hint, "screenname")) {
 			GtkWidget *optmenu = NULL;
-			PurpleRequestFieldGroup *group = purple_request_field_get_group(field);
-			GList *fields = purple_request_field_group_get_fields(group);
+			PurpleRequestGroup *group = purple_request_field_get_group(field);
+			GList *fields = purple_request_group_get_fields(group);
 
 			/* Ensure the account option menu is created (if the widget hasn't
 			 * been initialized already) for username auto-completion. */
@@ -1894,7 +1894,7 @@ pidgin_request_fields(const char *title, const char *primary,
 	GtkWidget *content;
 	GtkSizeGroup *sg, *datasheet_buttons_sg;
 	GList *gl, *fl;
-	PurpleRequestFieldGroup *group;
+	PurpleRequestGroup *group;
 	char *label_text;
 	char *primary_esc, *secondary_esc;
 	const gboolean compact = purple_request_cpar_is_compact(cpar);
@@ -2017,11 +2017,11 @@ pidgin_request_fields(const char *title, const char *primary,
 		gboolean contains_resizable = FALSE;
 
 		group      = gl->data;
-		field_list = purple_request_field_group_get_fields(group);
+		field_list = purple_request_group_get_fields(group);
 
-		if(purple_request_field_group_get_title(group) != NULL) {
+		if(purple_request_group_get_title(group) != NULL) {
 			frame = pidgin_make_frame(vbox,
-				purple_request_field_group_get_title(group));
+				purple_request_group_get_title(group));
 		} else {
 			frame = vbox;
 		}
diff --git a/pidgin/pidginmooddialog.c b/pidgin/pidginmooddialog.c
index e35e627dd5..870ac3a3f0 100644
--- a/pidgin/pidginmooddialog.c
+++ b/pidgin/pidginmooddialog.c
@@ -246,7 +246,7 @@ void
 pidgin_mood_dialog_show(PurpleAccount *account) {
 	const gchar *current_mood;
 	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *g;
+	PurpleRequestGroup *g;
 	PurpleRequestField *f;
 	PurpleConnection *gc = NULL;
 	PurpleProtocol *protocol = NULL;
@@ -265,7 +265,7 @@ pidgin_mood_dialog_show(PurpleAccount *account) {
 	}
 
 	fields = purple_request_fields_new();
-	g = purple_request_field_group_new(NULL);
+	g = purple_request_group_new(NULL);
 	f = purple_request_field_list_new("mood", _("Please select your mood from the list"));
 
 	purple_request_field_list_add_icon(f, _("None"), NULL, "");
@@ -297,16 +297,16 @@ pidgin_mood_dialog_show(PurpleAccount *account) {
 		if (current_mood && purple_strequal(current_mood, mood->mood))
 			purple_request_field_list_add_selected(f, _(mood->description));
 	}
-	purple_request_field_group_add_field(g, f);
+	purple_request_group_add_field(g, f);
 
 	purple_request_fields_add_group(fields, g);
 
 	/* if the connection allows setting a mood message */
 	if (gc && (purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_SUPPORT_MOOD_MESSAGES)) {
-		g = purple_request_field_group_new(NULL);
+		g = purple_request_group_new(NULL);
 		f = purple_request_field_string_new("text",
 		    _("Message (optional)"), NULL, FALSE);
-		purple_request_field_group_add_field(g, f);
+		purple_request_group_add_field(g, f);
 		purple_request_fields_add_group(fields, g);
 	}