Mercurial > pidgin.yaz
comparison finch/gntrequest.c @ 25329:c039a6e448d7
Revert the last 'struct-hiding' change.
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Wed, 26 Nov 2008 00:38:38 +0000 |
parents | 5d681e194fb3 |
children | 54a1c63873b2 |
comparison
equal
deleted
inserted
replaced
25328:5d681e194fb3 | 25329:c039a6e448d7 |
---|---|
311 { | 311 { |
312 PurpleRequestField *field = fields->data; | 312 PurpleRequestField *field = fields->data; |
313 PurpleRequestFieldType type = purple_request_field_get_type(field); | 313 PurpleRequestFieldType type = purple_request_field_get_type(field); |
314 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) | 314 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) |
315 { | 315 { |
316 GntWidget *check = purple_request_field_get_ui_data(field); | 316 GntWidget *check = FINCH_GET_DATA(field); |
317 gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check)); | 317 gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check)); |
318 purple_request_field_bool_set_value(field, value); | 318 purple_request_field_bool_set_value(field, value); |
319 } | 319 } |
320 else if (type == PURPLE_REQUEST_FIELD_STRING) | 320 else if (type == PURPLE_REQUEST_FIELD_STRING) |
321 { | 321 { |
322 GntWidget *entry = purple_request_field_get_ui_data(field); | 322 GntWidget *entry = FINCH_GET_DATA(field); |
323 const char *text = gnt_entry_get_text(GNT_ENTRY(entry)); | 323 const char *text = gnt_entry_get_text(GNT_ENTRY(entry)); |
324 purple_request_field_string_set_value(field, (text && *text) ? text : NULL); | 324 purple_request_field_string_set_value(field, (text && *text) ? text : NULL); |
325 } | 325 } |
326 else if (type == PURPLE_REQUEST_FIELD_INTEGER) | 326 else if (type == PURPLE_REQUEST_FIELD_INTEGER) |
327 { | 327 { |
328 GntWidget *entry = purple_request_field_get_ui_data(field); | 328 GntWidget *entry = FINCH_GET_DATA(field); |
329 const char *text = gnt_entry_get_text(GNT_ENTRY(entry)); | 329 const char *text = gnt_entry_get_text(GNT_ENTRY(entry)); |
330 int value = (text && *text) ? atoi(text) : 0; | 330 int value = (text && *text) ? atoi(text) : 0; |
331 purple_request_field_int_set_value(field, value); | 331 purple_request_field_int_set_value(field, value); |
332 } | 332 } |
333 else if (type == PURPLE_REQUEST_FIELD_CHOICE) | 333 else if (type == PURPLE_REQUEST_FIELD_CHOICE) |
334 { | 334 { |
335 GntWidget *combo = purple_request_field_get_ui_data(field); | 335 GntWidget *combo = FINCH_GET_DATA(field); |
336 int id; | 336 int id; |
337 id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo))); | 337 id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo))); |
338 purple_request_field_choice_set_value(field, id); | 338 purple_request_field_choice_set_value(field, id); |
339 } | 339 } |
340 else if (type == PURPLE_REQUEST_FIELD_LIST) | 340 else if (type == PURPLE_REQUEST_FIELD_LIST) |
341 { | 341 { |
342 GList *list = NULL; | 342 GList *list = NULL; |
343 if (purple_request_field_list_get_multi_select(field)) | 343 if (purple_request_field_list_get_multi_select(field)) |
344 { | 344 { |
345 GList *iter; | 345 GList *iter; |
346 GntWidget *tree = purple_request_field_get_ui_data(field); | 346 GntWidget *tree = FINCH_GET_DATA(field); |
347 | 347 |
348 iter = purple_request_field_list_get_items(field); | 348 iter = purple_request_field_list_get_items(field); |
349 for (; iter; iter = iter->next) | 349 for (; iter; iter = iter->next) |
350 { | 350 { |
351 const char *text = iter->data; | 351 const char *text = iter->data; |
354 list = g_list_prepend(list, key); | 354 list = g_list_prepend(list, key); |
355 } | 355 } |
356 } | 356 } |
357 else | 357 else |
358 { | 358 { |
359 GntWidget *combo = purple_request_field_get_ui_data(field); | 359 GntWidget *combo = FINCH_GET_DATA(field); |
360 gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)); | 360 gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)); |
361 list = g_list_append(list, data); | 361 list = g_list_append(list, data); |
362 } | 362 } |
363 | 363 |
364 purple_request_field_list_set_selected(field, list); | 364 purple_request_field_list_set_selected(field, list); |
365 g_list_free(list); | 365 g_list_free(list); |
366 } | 366 } |
367 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT) | 367 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT) |
368 { | 368 { |
369 GntWidget *combo = purple_request_field_get_ui_data(field); | 369 GntWidget *combo = FINCH_GET_DATA(field); |
370 PurpleAccount *acc = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)); | 370 PurpleAccount *acc = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)); |
371 purple_request_field_account_set_value(field, acc); | 371 purple_request_field_account_set_value(field, acc); |
372 } | 372 } |
373 } | 373 } |
374 } | 374 } |
611 gnt_box_add_widget(GNT_BOX(hbox), l); | 611 gnt_box_add_widget(GNT_BOX(hbox), l); |
612 } | 612 } |
613 | 613 |
614 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) | 614 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) |
615 { | 615 { |
616 purple_request_field_set_ui_data(field, create_boolean_field(field)); | 616 FINCH_SET_DATA(field, create_boolean_field(field)); |
617 } | 617 } |
618 else if (type == PURPLE_REQUEST_FIELD_STRING) | 618 else if (type == PURPLE_REQUEST_FIELD_STRING) |
619 { | 619 { |
620 purple_request_field_set_ui_data(field, create_string_field(field, &screenname)); | 620 FINCH_SET_DATA(field, create_string_field(field, &screenname)); |
621 } | 621 } |
622 else if (type == PURPLE_REQUEST_FIELD_INTEGER) | 622 else if (type == PURPLE_REQUEST_FIELD_INTEGER) |
623 { | 623 { |
624 purple_request_field_set_ui_data(field, create_integer_field(field)); | 624 FINCH_SET_DATA(field, create_integer_field(field)); |
625 } | 625 } |
626 else if (type == PURPLE_REQUEST_FIELD_CHOICE) | 626 else if (type == PURPLE_REQUEST_FIELD_CHOICE) |
627 { | 627 { |
628 purple_request_field_set_ui_data(field, create_choice_field(field)); | 628 FINCH_SET_DATA(field, create_choice_field(field)); |
629 } | 629 } |
630 else if (type == PURPLE_REQUEST_FIELD_LIST) | 630 else if (type == PURPLE_REQUEST_FIELD_LIST) |
631 { | 631 { |
632 purple_request_field_set_ui_data(field, create_list_field(field)); | 632 FINCH_SET_DATA(field, create_list_field(field)); |
633 } | 633 } |
634 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT) | 634 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT) |
635 { | 635 { |
636 accountlist = create_account_field(field); | 636 accountlist = create_account_field(field); |
637 purple_request_field_set_ui_data(field, accountlist); | 637 FINCH_SET_DATA(field, accountlist); |
638 } | 638 } |
639 else | 639 else |
640 { | 640 { |
641 purple_request_field_set_ui_data(field, gnt_label_new_with_format(_("Not implemented yet."), | 641 FINCH_SET_DATA(field, gnt_label_new_with_format(_("Not implemented yet."), |
642 GNT_TEXT_FLAG_BOLD)); | 642 GNT_TEXT_FLAG_BOLD)); |
643 } | 643 } |
644 gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID); | 644 gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID); |
645 gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(purple_request_field_get_ui_data(field))); | 645 gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(FINCH_GET_DATA(field))); |
646 } | 646 } |
647 if (grlist->next) | 647 if (grlist->next) |
648 gnt_box_add_widget(GNT_BOX(box), gnt_hline_new()); | 648 gnt_box_add_widget(GNT_BOX(box), gnt_hline_new()); |
649 } | 649 } |
650 gnt_box_add_widget(GNT_BOX(window), box); | 650 gnt_box_add_widget(GNT_BOX(window), box); |