Make PurpleRequestFieldChoice into a GObject

This also does an `hg cp`, though with all the renaming of the parameter names, maybe that wasn't as useful for tracking the diff.

I wonder if this should implement `GListModel`, but the values are currently arbitrary pointers, so it won't work right now.

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

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

5 files changed, 63 insertions, 38 deletions

diff --git a/libpurple/protocols/demo/purpledemoprotocolactions.c b/libpurple/protocols/demo/purpledemoprotocolactions.c
index bbe24adbdc..a3471eeb24 100644
--- a/libpurple/protocols/demo/purpledemoprotocolactions.c
+++ b/libpurple/protocols/demo/purpledemoprotocolactions.c
@@ -455,6 +455,7 @@ purple_demo_protocol_request_fields_activate(G_GNUC_UNUSED GSimpleAction *action
 	PurpleRequestPage *page = NULL;
 	PurpleRequestGroup *group = NULL;
 	PurpleRequestField *field = NULL;
+	PurpleRequestFieldChoice *choice_field = NULL;
 	GBytes *icon = NULL;
 	gconstpointer icon_data = NULL;
 	gsize icon_len = 0;
@@ -520,10 +521,11 @@ purple_demo_protocol_request_fields_activate(G_GNUC_UNUSED GSimpleAction *action
 	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_choice_new("choice", _("A choice"), "foo");
-	purple_request_field_choice_add(field, _("foo"), "foo");
-	purple_request_field_choice_add(field, _("bar"), "bar");
-	purple_request_field_choice_add(field, _("baz"), "baz");
-	purple_request_field_choice_add(field, _("quux"), "quux");
+	choice_field = PURPLE_REQUEST_FIELD_CHOICE(field);
+	purple_request_field_choice_add(choice_field, _("foo"), "foo");
+	purple_request_field_choice_add(choice_field, _("bar"), "bar");
+	purple_request_field_choice_add(choice_field, _("baz"), "baz");
+	purple_request_field_choice_add(choice_field, _("quux"), "quux");
 	purple_request_group_add_field(group, field);
 
 	field = purple_request_field_list_new("list", _("A list"));
diff --git a/libpurple/protocols/gg/pubdir-prpl.c b/libpurple/protocols/gg/pubdir-prpl.c
index 379812c0d5..397a26d87b 100644
--- a/libpurple/protocols/gg/pubdir-prpl.c
+++ b/libpurple/protocols/gg/pubdir-prpl.c
@@ -749,6 +749,7 @@ ggp_pubdir_search(PurpleConnection *gc, const ggp_pubdir_search_form *form)
 	PurpleRequestPage *page;
 	PurpleRequestGroup *group;
 	PurpleRequestField *field;
+	PurpleRequestFieldChoice *choice;
 
 	purple_debug_info("gg", "ggp_pubdir_search");
 
@@ -766,11 +767,12 @@ ggp_pubdir_search(PurpleConnection *gc, const ggp_pubdir_search_form *form)
 
 	field = purple_request_field_choice_new(
 	        "gender", _("Gender"), form ? GINT_TO_POINTER(form->gender) : NULL);
-	purple_request_field_choice_add(field, _("Male or female"), NULL);
-	purple_request_field_choice_add(field, _("Male"),
-		GINT_TO_POINTER(GGP_PUBDIR_GENDER_MALE));
-	purple_request_field_choice_add(field, _("Female"),
-		GINT_TO_POINTER(GGP_PUBDIR_GENDER_FEMALE));
+	choice = PURPLE_REQUEST_FIELD_CHOICE(field);
+	purple_request_field_choice_add(choice, _("Male or female"), NULL);
+	purple_request_field_choice_add(choice, _("Male"),
+	                                GINT_TO_POINTER(GGP_PUBDIR_GENDER_MALE));
+	purple_request_field_choice_add(choice, _("Female"),
+	                                GINT_TO_POINTER(GGP_PUBDIR_GENDER_FEMALE));
 	purple_request_group_add_field(group, field);
 
 	purple_request_fields(gc, _("Find buddies"), _("Find buddies"),
@@ -935,6 +937,7 @@ ggp_pubdir_set_info_dialog(PurpleConnection *gc, int records_count,
 	PurpleRequestPage *page;
 	PurpleRequestGroup *group;
 	PurpleRequestField *field;
+	PurpleRequestFieldChoice *choice;
 	gchar *bday = NULL;
 	gsize i;
 	const ggp_pubdir_record *record;
@@ -962,10 +965,11 @@ ggp_pubdir_set_info_dialog(PurpleConnection *gc, int records_count,
 	        "gender", _("Gender"),
 	        record ? GINT_TO_POINTER(record->gender)
 	               : GGP_PUBDIR_GENDER_UNSPECIFIED);
+	choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 	purple_request_field_set_required(field, TRUE);
-	purple_request_field_choice_add(field, _("Male"),
+	purple_request_field_choice_add(choice, _("Male"),
 	                                GINT_TO_POINTER(GGP_PUBDIR_GENDER_MALE));
-	purple_request_field_choice_add(field, _("Female"),
+	purple_request_field_choice_add(choice, _("Female"),
 	                                GINT_TO_POINTER(GGP_PUBDIR_GENDER_FEMALE));
 	purple_request_group_add_field(group, field);
 
@@ -991,13 +995,14 @@ ggp_pubdir_set_info_dialog(PurpleConnection *gc, int records_count,
 	   your language, feel free to use it. Otherwise it's probably acceptable
 	   to leave it changed or transliterate it into your alphabet. */
 	field = purple_request_field_choice_new("province", _("Voivodeship"), 0);
+	choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 	purple_request_group_add_field(group, field);
 	for (i = 0; i < ggp_pubdir_provinces_count; i++) {
-		purple_request_field_choice_add(field, ggp_pubdir_provinces[i],
+		purple_request_field_choice_add(choice, ggp_pubdir_provinces[i],
 		                                GINT_TO_POINTER(i));
 		if (record && i == record->province) {
-			purple_request_field_choice_set_value(field, GINT_TO_POINTER(i));
-			purple_request_field_choice_set_default_value(field,
+			purple_request_field_choice_set_value(choice, GINT_TO_POINTER(i));
+			purple_request_field_choice_set_default_value(choice,
 			                                              GINT_TO_POINTER(i));
 		}
 	}
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index b0c58d2f0e..42a709edc9 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -2622,8 +2622,7 @@ jabber_media_cancel_cb(JabberMediaRequest *request,
 
 static void
 jabber_media_ok_cb(JabberMediaRequest *request, PurpleRequestPage *page) {
-	PurpleRequestField *field = purple_request_page_get_field(page, "resource");
-	const gchar *selected = purple_request_field_choice_get_value(field);
+	const gchar *selected = purple_request_page_get_choice(page, "resource");
 	gchar *who = g_strdup_printf("%s/%s", request->who, selected);
 	jabber_initiate_media(request->media, request->account, who, request->type);
 
@@ -2698,10 +2697,12 @@ jabber_initiate_media(PurpleProtocolMedia *media, PurpleAccount *account,
 		char *msg;
 		PurpleRequestPage *page = NULL;
 		PurpleRequestField *field = NULL;
+		PurpleRequestFieldChoice *choice = NULL;
 		PurpleRequestGroup *group = NULL;
 		JabberMediaRequest *request;
 
 		field = purple_request_field_choice_new("resource", _("Resource"), 0);
+		choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 		for(l = jb->resources; l; l = l->next)
 		{
 			JabberBuddyResource *ljbr = l->data;
@@ -2715,19 +2716,22 @@ jabber_initiate_media(PurpleProtocolMedia *media, PurpleAccount *account,
 					(type & PURPLE_MEDIA_VIDEO)) {
 				if (caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO) {
 					jbr = ljbr;
-					purple_request_field_choice_add_full(field,
-					        jbr->name, g_strdup(jbr->name), g_free);
+					purple_request_field_choice_add_full(choice, jbr->name,
+					                                     g_strdup(jbr->name),
+					                                     g_free);
 				}
 			} else if (type & (PURPLE_MEDIA_AUDIO) &&
 					(caps & PURPLE_MEDIA_CAPS_AUDIO)) {
 				jbr = ljbr;
-				purple_request_field_choice_add_full(field,
-				        jbr->name, g_strdup(jbr->name), g_free);
+				purple_request_field_choice_add_full(choice, jbr->name,
+				                                     g_strdup(jbr->name),
+				                                     g_free);
 			}else if (type & (PURPLE_MEDIA_VIDEO) &&
 					(caps & PURPLE_MEDIA_CAPS_VIDEO)) {
 				jbr = ljbr;
-				purple_request_field_choice_add_full(field,
-				        jbr->name, g_strdup(jbr->name), g_free);
+				purple_request_field_choice_add_full(choice, jbr->name,
+				                                     g_strdup(jbr->name),
+				                                     g_free);
 			}
 		}
 
@@ -2737,8 +2741,7 @@ jabber_initiate_media(PurpleProtocolMedia *media, PurpleAccount *account,
 			return FALSE;
 		}
 
-		if (g_list_length(purple_request_field_choice_get_elements(
-				field)) <= 1) {
+		if(g_list_length(purple_request_field_choice_get_elements(choice)) <= 1) {
 			gchar *name;
 			gboolean result;
 			g_object_unref(field);
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index ad259699de..602c46ba09 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -1519,8 +1519,7 @@ static void do_transfer_send(PurpleXfer *xfer, const char *resource)
 static void
 resource_select_ok_cb(PurpleXfer *xfer, PurpleRequestPage *page)
 {
-	PurpleRequestField *field = purple_request_page_get_field(page, "resource");
-	const char *selected_label = purple_request_field_choice_get_value(field);
+	const char *selected_label = purple_request_page_get_choice(page, "resource");
 
 	do_transfer_send(xfer, selected_label);
 }
@@ -1587,20 +1586,31 @@ static void jabber_si_xfer_xfer_init(PurpleXfer *xfer)
 		} else {
 			/* we've got multiple resources, we need to pick one to send to */
 			GList *l;
-			char *msg = g_strdup_printf(_("Please select the resource of %s to which you would like to send a file"), purple_xfer_get_remote_user(xfer));
-			PurpleRequestPage *page = purple_request_page_new();
-			PurpleRequestField *field = purple_request_field_choice_new("resource", _("Resource"), 0);
-			PurpleRequestGroup *group = purple_request_group_new(NULL);
-
+			PurpleRequestPage *page = NULL;
+			PurpleRequestField *field = NULL;
+			PurpleRequestFieldChoice *choice = NULL;
+			PurpleRequestGroup *group = NULL;
+			char *msg = NULL;
+
+			field = purple_request_field_choice_new("resource", _("Resource"), 0);
+			choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 			for(l = resources; l; l = l->next) {
 				jbr = l->data;
-				purple_request_field_choice_add_full(field, jbr->name, g_strdup(jbr->name), g_free);
+				purple_request_field_choice_add_full(choice, jbr->name,
+				                                     g_strdup(jbr->name),
+				                                     g_free);
 			}
 
+			group = purple_request_group_new(NULL);
 			purple_request_group_add_field(group, field);
 
+			page = purple_request_page_new();
 			purple_request_page_add_group(page, group);
 
+			msg = g_strdup_printf(_("Please select the resource of %s to "
+			                        "which you would like to send a file"),
+			                      purple_xfer_get_remote_user(xfer));
+
 			purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, page,
 					_("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb),
 					purple_request_cpar_from_connection(jsx->js->gc), xfer);
diff --git a/libpurple/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c
index 33e836470e..1cc3c78ed9 100644
--- a/libpurple/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
@@ -64,11 +64,12 @@ jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestPage *page) {
 		if(groups->data == data->actiongroup) {
 			for(flds = purple_request_group_get_fields(groups->data); flds; flds = flds->next) {
 				PurpleRequestField *field = flds->data;
+				PurpleRequestFieldChoice *choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 				const char *id = purple_request_field_get_id(field);
 				int handleindex;
 				if(!purple_strequal(id, "libpurple:jabber:xdata:actions"))
 					continue;
-				handleindex = GPOINTER_TO_INT(purple_request_field_choice_get_value(field));
+				handleindex = GPOINTER_TO_INT(purple_request_field_choice_get_value(choice));
 				actionhandle = g_strdup(g_list_nth_data(data->actions, handleindex));
 				break;
 			}
@@ -369,22 +370,26 @@ void *jabber_x_data_request_with_actions(JabberStream *js, PurpleXmlNode *packet
 	}
 
 	if(actions != NULL) {
-		PurpleRequestField *actionfield;
+		PurpleRequestField *field = NULL;
+		PurpleRequestFieldChoice *choice = NULL;
 		GList *action;
 		int i;
 
 		data->actiongroup = group = purple_request_group_new(_("Actions"));
 		purple_request_page_add_group(page, group);
-		actionfield = purple_request_field_choice_new("libpurple:jabber:xdata:actions", _("Select an action"), GINT_TO_POINTER(defaultaction));
+		field = purple_request_field_choice_new("libpurple:jabber:xdata:actions",
+		                                        _("Select an action"),
+		                                        GINT_TO_POINTER(defaultaction));
+		choice = PURPLE_REQUEST_FIELD_CHOICE(field);
 
 		for(i = 0, action = actions; action; action = g_list_next(action), i++) {
 			JabberXDataAction *a = action->data;
 
-			purple_request_field_choice_add(actionfield, a->name, GINT_TO_POINTER(i));
+			purple_request_field_choice_add(choice, a->name, GINT_TO_POINTER(i));
 			data->actions = g_list_append(data->actions, g_strdup(a->handle));
 		}
-		purple_request_field_set_required(actionfield,TRUE);
-		purple_request_group_add_field(group, actionfield);
+		purple_request_field_set_required(field, TRUE);
+		purple_request_group_add_field(group, field);
 	}
 
 	if((x = purple_xmlnode_get_child(packet, "title")))