pidgin.next.minor: 782dc6d0: Revert the last 'struct-hiding' change.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 782dc6d0296f164df8ac0bcbd09e24d70044d727
Ancestor: 97e3cbbb75e7334c6259ac1cc62f861b13c47a49
Author: sadrul at pidgin.im
Date: 2008-11-26T00:38:38
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/782dc6d0296f164df8ac0bcbd09e24d70044d727

Modified files:
        finch/gntrequest.c

ChangeLog: 

Revert the last 'struct-hiding' change.

-------------- next part --------------
============================================================
--- finch/gntrequest.c	735ecb2f87753b8ae80dceeb7367cc7ccef1249e
+++ finch/gntrequest.c	831f14ce46c5810dac1f27d3216b52ba09d4f60a
@@ -313,26 +313,26 @@ request_fields_cb(GntWidget *button, Pur
 			PurpleRequestFieldType type = purple_request_field_get_type(field);
 			if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
 			{
-				GntWidget *check = purple_request_field_get_ui_data(field);
+				GntWidget *check = FINCH_GET_DATA(field);
 				gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check));
 				purple_request_field_bool_set_value(field, value);
 			}
 			else if (type == PURPLE_REQUEST_FIELD_STRING)
 			{
-				GntWidget *entry = purple_request_field_get_ui_data(field);
+				GntWidget *entry = FINCH_GET_DATA(field);
 				const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
 				purple_request_field_string_set_value(field, (text && *text) ? text : NULL);
 			}
 			else if (type == PURPLE_REQUEST_FIELD_INTEGER)
 			{
-				GntWidget *entry = purple_request_field_get_ui_data(field);
+				GntWidget *entry = FINCH_GET_DATA(field);
 				const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
 				int value = (text && *text) ? atoi(text) : 0;
 				purple_request_field_int_set_value(field, value);
 			}
 			else if (type == PURPLE_REQUEST_FIELD_CHOICE)
 			{
-				GntWidget *combo = purple_request_field_get_ui_data(field);
+				GntWidget *combo = FINCH_GET_DATA(field);
 				int id;
 				id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)));
 				purple_request_field_choice_set_value(field, id);
@@ -343,7 +343,7 @@ request_fields_cb(GntWidget *button, Pur
 				if (purple_request_field_list_get_multi_select(field))
 				{
 					GList *iter;
-					GntWidget *tree = purple_request_field_get_ui_data(field);
+					GntWidget *tree = FINCH_GET_DATA(field);
 
 					iter = purple_request_field_list_get_items(field);
 					for (; iter; iter = iter->next)
@@ -356,7 +356,7 @@ request_fields_cb(GntWidget *button, Pur
 				}
 				else
 				{
-					GntWidget *combo = purple_request_field_get_ui_data(field);
+					GntWidget *combo = FINCH_GET_DATA(field);
 					gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
 					list = g_list_append(list, data);
 				}
@@ -366,7 +366,7 @@ request_fields_cb(GntWidget *button, Pur
 			}
 			else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
 			{
-				GntWidget *combo = purple_request_field_get_ui_data(field);
+				GntWidget *combo = FINCH_GET_DATA(field);
 				PurpleAccount *acc = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
 				purple_request_field_account_set_value(field, acc);
 			}
@@ -613,36 +613,36 @@ finch_request_fields(const char *title, 
 
 			if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
 			{
-				purple_request_field_set_ui_data(field, create_boolean_field(field));
+				FINCH_SET_DATA(field, create_boolean_field(field));
 			}
 			else if (type == PURPLE_REQUEST_FIELD_STRING)
 			{
-				purple_request_field_set_ui_data(field, create_string_field(field, &screenname));
+				FINCH_SET_DATA(field, create_string_field(field, &screenname));
 			}
 			else if (type == PURPLE_REQUEST_FIELD_INTEGER)
 			{
-				purple_request_field_set_ui_data(field, create_integer_field(field));
+				FINCH_SET_DATA(field, create_integer_field(field));
 			}
 			else if (type == PURPLE_REQUEST_FIELD_CHOICE)
 			{
-				purple_request_field_set_ui_data(field, create_choice_field(field));
+				FINCH_SET_DATA(field, create_choice_field(field));
 			}
 			else if (type == PURPLE_REQUEST_FIELD_LIST)
 			{
-				purple_request_field_set_ui_data(field, create_list_field(field));
+				FINCH_SET_DATA(field, create_list_field(field));
 			}
 			else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
 			{
 				accountlist = create_account_field(field);
-				purple_request_field_set_ui_data(field, accountlist);
+				FINCH_SET_DATA(field, accountlist);
 			}
 			else
 			{
-				purple_request_field_set_ui_data(field, gnt_label_new_with_format(_("Not implemented yet."),
-						                 GNT_TEXT_FLAG_BOLD));
+				FINCH_SET_DATA(field, gnt_label_new_with_format(_("Not implemented yet."),
+						GNT_TEXT_FLAG_BOLD));
 			}
 			gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
-			gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(purple_request_field_get_ui_data(field)));
+			gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(FINCH_GET_DATA(field)));
 		}
 		if (grlist->next)
 			gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());