comparison: finch/gntrequest.c
finch/gntrequest.c
- changeset 35378
- 5d9e2581005b
- parent 34955
- 854143116575
- child 35475
- ec0d44434ba8
equal
deleted
inserted
replaced
| 35377:9f8e83051c26 | 35378:5d9e2581005b |
|---|---|
| 310 GList *fields = purple_request_field_group_get_fields(group); | 310 GList *fields = purple_request_field_group_get_fields(group); |
| 311 | 311 |
| 312 for (; fields ; fields = fields->next) | 312 for (; fields ; fields = fields->next) |
| 313 { | 313 { |
| 314 PurpleRequestField *field = fields->data; | 314 PurpleRequestField *field = fields->data; |
| 315 PurpleRequestFieldType type = purple_request_field_get_type(field); | 315 PurpleRequestFieldType type = purple_request_field_get_field_type(field); |
| 316 if (!purple_request_field_is_visible(field)) | 316 if (!purple_request_field_is_visible(field)) |
| 317 continue; | 317 continue; |
| 318 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) | 318 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) |
| 319 { | 319 { |
| 320 GntWidget *check = purple_request_field_get_ui_data(field); | 320 GntWidget *check = purple_request_field_get_ui_data(field); |
| 431 } | 431 } |
| 432 | 432 |
| 433 static GntWidget* | 433 static GntWidget* |
| 434 create_string_field(PurpleRequestField *field, GntWidget **username) | 434 create_string_field(PurpleRequestField *field, GntWidget **username) |
| 435 { | 435 { |
| 436 const char *hint = purple_request_field_get_type_hint(field); | 436 const char *hint = purple_request_field_get_field_type_hint(field); |
| 437 GntWidget *entry = gnt_entry_new( | 437 GntWidget *entry = gnt_entry_new( |
| 438 purple_request_field_string_get_default_value(field)); | 438 purple_request_field_string_get_default_value(field)); |
| 439 gnt_entry_set_masked(GNT_ENTRY(entry), | 439 gnt_entry_set_masked(GNT_ENTRY(entry), |
| 440 purple_request_field_string_is_masked(field)); | 440 purple_request_field_string_is_masked(field)); |
| 441 if (hint && purple_str_has_prefix(hint, "screenname")) { | 441 if (hint && purple_str_has_prefix(hint, "screenname")) { |
| 626 gnt_label_new_with_format(title, GNT_TEXT_FLAG_BOLD)); | 626 gnt_label_new_with_format(title, GNT_TEXT_FLAG_BOLD)); |
| 627 | 627 |
| 628 for (; fields ; fields = fields->next) | 628 for (; fields ; fields = fields->next) |
| 629 { | 629 { |
| 630 PurpleRequestField *field = fields->data; | 630 PurpleRequestField *field = fields->data; |
| 631 PurpleRequestFieldType type = purple_request_field_get_type(field); | 631 PurpleRequestFieldType type = purple_request_field_get_field_type(field); |
| 632 const char *label = purple_request_field_get_label(field); | 632 const char *label = purple_request_field_get_label(field); |
| 633 | 633 |
| 634 if (!purple_request_field_is_visible(field)) | 634 if (!purple_request_field_is_visible(field)) |
| 635 continue; | 635 continue; |
| 636 | 636 |
| 846 PurpleRequestFieldGroup *group = list->data; | 846 PurpleRequestFieldGroup *group = list->data; |
| 847 GList *fields = purple_request_field_group_get_fields(group); | 847 GList *fields = purple_request_field_group_get_fields(group); |
| 848 | 848 |
| 849 for (; fields ; fields = fields->next) { | 849 for (; fields ; fields = fields->next) { |
| 850 PurpleRequestField *field = fields->data; | 850 PurpleRequestField *field = fields->data; |
| 851 PurpleRequestFieldType type = purple_request_field_get_type(field); | 851 PurpleRequestFieldType type = purple_request_field_get_field_type(field); |
| 852 PurplePrefType pt; | 852 PurplePrefType pt; |
| 853 gpointer val = NULL; | 853 gpointer val = NULL; |
| 854 const char *id = purple_request_field_get_id(field); | 854 const char *id = purple_request_field_get_id(field); |
| 855 | 855 |
| 856 switch (type) { | 856 switch (type) { |
| 869 break; | 869 break; |
| 870 default: | 870 default: |
| 871 break; | 871 break; |
| 872 } | 872 } |
| 873 | 873 |
| 874 pt = purple_prefs_get_type(id); | 874 pt = purple_prefs_get_pref_type(id); |
| 875 switch (pt) { | 875 switch (pt) { |
| 876 case PURPLE_PREF_INT: | 876 case PURPLE_PREF_INT: |
| 877 { | 877 { |
| 878 long int tmp = GPOINTER_TO_INT(val); | 878 long int tmp = GPOINTER_TO_INT(val); |
| 879 if (type == PURPLE_REQUEST_FIELD_LIST) /* Lists always return string */ | 879 if (type == PURPLE_REQUEST_FIELD_LIST) /* Lists always return string */ |
| 895 } | 895 } |
| 896 | 896 |
| 897 GntWidget *finch_request_field_get_widget(PurpleRequestField *field) | 897 GntWidget *finch_request_field_get_widget(PurpleRequestField *field) |
| 898 { | 898 { |
| 899 GntWidget *ret = NULL; | 899 GntWidget *ret = NULL; |
| 900 switch (purple_request_field_get_type(field)) { | 900 switch (purple_request_field_get_field_type(field)) { |
| 901 case PURPLE_REQUEST_FIELD_BOOLEAN: | 901 case PURPLE_REQUEST_FIELD_BOOLEAN: |
| 902 ret = create_boolean_field(field); | 902 ret = create_boolean_field(field); |
| 903 break; | 903 break; |
| 904 case PURPLE_REQUEST_FIELD_STRING: | 904 case PURPLE_REQUEST_FIELD_STRING: |
| 905 ret = create_string_field(field, NULL); | 905 ret = create_string_field(field, NULL); |
| 915 break; | 915 break; |
| 916 case PURPLE_REQUEST_FIELD_ACCOUNT: | 916 case PURPLE_REQUEST_FIELD_ACCOUNT: |
| 917 ret = create_account_field(field); | 917 ret = create_account_field(field); |
| 918 break; | 918 break; |
| 919 default: | 919 default: |
| 920 purple_debug_error("GntRequest", "Unimplemented request-field %d\n", purple_request_field_get_type(field)); | 920 purple_debug_error("GntRequest", "Unimplemented request-field %d\n", |
| 921 purple_request_field_get_field_type(field)); | |
| 921 break; | 922 break; |
| 922 } | 923 } |
| 923 return ret; | 924 return ret; |
| 924 } | 925 } |
| 925 | 926 |
