# HG changeset patch
# User andrew.victor@mxit.com
# Date 1316124175 0
# Node ID 694382c3d150561836075bb81dd2ea52d81ef6c8
# Parent  d337a23e5536b5b0e1f16156078aba14374a8591
Remove deprecated purple_request_field_list_add().

diff -r d337a23e5536 -r 694382c3d150 ChangeLog.API
--- a/ChangeLog.API	Thu Sep 15 21:57:04 2011 +0000
+++ b/ChangeLog.API	Thu Sep 15 22:02:55 2011 +0000
@@ -130,6 +130,7 @@
 		* purple_presence_add_status
 		* purple_presence_add_list
 		* purple_proxy_connect_socks5
+		* purple_request_field_list_add
 		* purple_srv_cancel
 		* purple_srv_resolve_account
 		* purple_ssl_connect_fd
diff -r d337a23e5536 -r 694382c3d150 libpurple/plugins/perl/common/Request.xs
--- a/libpurple/plugins/perl/common/Request.xs	Thu Sep 15 21:57:04 2011 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Thu Sep 15 22:02:55 2011 +0000
@@ -374,12 +374,6 @@
 	C_ARGS: id, text
 
 void
-purple_request_field_list_add(field, item, data)
-	Purple::Request::Field field
-	const char *item
-	void * data
-
-void
 purple_request_field_list_add_icon(field, item, icon_path, data)
 	Purple::Request::Field field
 	const char *item
diff -r d337a23e5536 -r 694382c3d150 libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Thu Sep 15 21:57:04 2011 +0000
+++ b/libpurple/protocols/gg/gg.c	Thu Sep 15 22:02:55 2011 +0000
@@ -857,7 +857,7 @@
 	field = purple_request_field_list_new("name", "Chat name");
 	for (l = info->chats; l != NULL; l = l->next) {
 		GGPChat *chat = l->data;
-		purple_request_field_list_add(field, chat->name, chat->name);
+		purple_request_field_list_add_icon(field, chat->name, NULL, chat->name);
 	}
 	purple_request_field_group_add_field(group, field);
 
diff -r d337a23e5536 -r 694382c3d150 libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c	Thu Sep 15 21:57:04 2011 +0000
+++ b/libpurple/protocols/mxit/login.c	Thu Sep 15 22:02:55 2011 +0000
@@ -656,7 +656,7 @@
 			/* oops, this is not good, time to bail */
 			break;
 		}
-		purple_request_field_list_add( field, country[1], g_strdup( country[0] ) );
+		purple_request_field_list_add_icon( field, country[1], NULL, g_strdup( country[0] ) );
 		if ( strcmp( country[1], parts[6] ) == 0 ) {
 			/* based on the user's IP, this is his current country code, so we default to it */
 			purple_request_field_list_add_selected( field, country[1] );
@@ -677,7 +677,7 @@
 			/* oops, this is not good, time to bail */
 			break;
 		}
-		purple_request_field_list_add( field, locale[1], g_strdup( locale[0] ) );
+		purple_request_field_list_add_icon( field, locale[1], NULL, g_strdup( locale[0] ) );
 		g_strfreev( locale );
 	}
 	purple_request_field_list_add_selected( field, "English" );
diff -r d337a23e5536 -r 694382c3d150 libpurple/request.c
--- a/libpurple/request.c	Thu Sep 15 21:57:04 2011 +0000
+++ b/libpurple/request.c	Thu Sep 15 22:02:55 2011 +0000
@@ -992,13 +992,6 @@
 }
 
 void
-purple_request_field_list_add(PurpleRequestField *field, const char *item,
-							void *data)
-{
-	purple_request_field_list_add_icon(field, item, NULL, data);
-}
-
-void
 purple_request_field_list_add_icon(PurpleRequestField *field, const char *item, const char* icon_path,
 							void *data)
 {
diff -r d337a23e5536 -r 694382c3d150 libpurple/request.h
--- a/libpurple/request.h	Thu Sep 15 21:57:04 2011 +0000
+++ b/libpurple/request.h	Thu Sep 15 22:02:55 2011 +0000
@@ -905,18 +905,6 @@
  *
  * @param field The list field.
  * @param item  The list item.
- * @param data  The associated data.
- *
- * @deprecated Use purple_request_field_list_add_icon() instead.
- */
-void purple_request_field_list_add(PurpleRequestField *field,
-								 const char *item, void *data);
-
-/**
- * Adds an item to a list field.
- *
- * @param field The list field.
- * @param item  The list item.
  * @param icon_path The path to icon file, or @c NULL for no icon.
  * @param data  The associated data.
  */
diff -r d337a23e5536 -r 694382c3d150 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Thu Sep 15 21:57:04 2011 +0000
+++ b/pidgin/gtkblist.c	Thu Sep 15 22:02:55 2011 +0000
@@ -3539,7 +3539,7 @@
 	g = purple_request_field_group_new(NULL);
 	f = purple_request_field_list_new("mood", _("Please select your mood from the list"));
 
-	purple_request_field_list_add(f, _("None"), "");
+	purple_request_field_list_add_icon(f, _("None"), NULL, "");
 	if (current_mood == NULL)
 		purple_request_field_list_add_selected(f, _("None"));