# HG changeset patch # User Sadrul Habib Chowdhury # Date 1227659918 0 # Node ID c039a6e448d79ac778faa897eb73ad2c450a7896 # Parent 5d681e194fb3230a7e438cfab18454af4991c625 Revert the last 'struct-hiding' change. diff -r 5d681e194fb3 -r c039a6e448d7 finch/gntrequest.c --- a/finch/gntrequest.c Tue Nov 18 05:35:45 2008 +0000 +++ b/finch/gntrequest.c Wed Nov 26 00:38:38 2008 +0000 @@ -313,26 +313,26 @@ 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 @@ 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 @@ } 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 @@ } 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 @@ 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());