pidgin: 1323146d: Remove deprecated purple_request_field_l...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 1323146d662c36442b0bf3cb0173704d42c831f9
Parent:   227e83102ab14599d8c9e36fc1f506cd37899027
Author:   andrew.victor at mxit.com
Date:     09/15/11 18:02:55
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1323146d662c36442b0bf3cb0173704d42c831f9

Changelog: 

Remove deprecated purple_request_field_list_add().


Changes against parent 227e83102ab14599d8c9e36fc1f506cd37899027

  patched  ChangeLog.API
  patched  libpurple/plugins/perl/common/Request.xs
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/request.c
  patched  libpurple/request.h
  patched  pidgin/gtkblist.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/gg.c	8817be333b47457e3484b61ef5ba484df4059395
+++ libpurple/protocols/gg/gg.c	38e3a3bcdbcd92597e51d68b036a664ab0f73be1
@@ -857,7 +857,7 @@ static void ggp_bmenu_add_to_chat(Purple
 	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);
 
============================================================
--- pidgin/gtkblist.c	08202bd24716be3a2339f8fcb026f6ee1669845b
+++ pidgin/gtkblist.c	fdbcad9622c31d76833988446ab025969b7dc380
@@ -3539,7 +3539,7 @@ set_mood_cb(GtkWidget *widget, PurpleAcc
 	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"));
 
============================================================
--- libpurple/request.c	1a08e90926d962a6384a88aa7f8e94bd67f44ee5
+++ libpurple/request.c	e44317d088aa83f84d8a85b31530e2bcde7af220
@@ -992,13 +992,6 @@ void
 }
 
 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)
 {
============================================================
--- libpurple/request.h	b32e33550372256ffe548650d1eb7b8995975156
+++ libpurple/request.h	d171f29c28cfb45e24f9a2bba8f164e9e728fada
@@ -905,18 +905,6 @@ void *purple_request_field_list_get_data
  *
  * @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.
  */
============================================================
--- ChangeLog.API	02ea4f353c104a1bfb9f25f7402ec49870121667
+++ ChangeLog.API	32e9d5f1549f30fe975d4009cbf67c0dce3a5015
@@ -130,6 +130,7 @@ version 3.0.0 (??/??/????):
 		* 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
============================================================
--- libpurple/plugins/perl/common/Request.xs	ce85162d4264019b9d27d08534bb16cce748431c
+++ libpurple/plugins/perl/common/Request.xs	5dc1f14763e30723bddbe5df5da6282e2ed8f0b3
@@ -374,12 +374,6 @@ void
 	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
============================================================
--- libpurple/protocols/mxit/login.c	2125f1b6f7ede0c28c4890354cbfb043274f71bf
+++ libpurple/protocols/mxit/login.c	aedb9db7025e329d8ef96f4b2965f5d6e4450c0f
@@ -656,7 +656,7 @@ static void mxit_cb_clientinfo1( PurpleU
 			/* 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 @@ static void mxit_cb_clientinfo1( PurpleU
 			/* 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" );