Mercurial > pidgin.yaz
diff finch/gntrequest.c @ 17319:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Wed, 30 May 2007 02:56:25 +0000 |
| parents | 46f2f86e08e4 |
| children | a236c67e39b6 |
line wrap: on
line diff
--- a/finch/gntrequest.c Wed May 23 04:18:05 2007 +0000 +++ b/finch/gntrequest.c Wed May 30 02:56:25 2007 +0000 @@ -497,7 +497,9 @@ field->ui_data = combo; all = purple_request_field_account_get_show_all(field); - def = purple_request_field_account_get_default_value(field); + def = purple_request_field_account_get_value(field); + if (!def) + def = purple_request_field_account_get_default_value(field); if (all) list = purple_accounts_get_all(); @@ -610,13 +612,17 @@ static PurpleRequestUiOps uiops = { - .request_input = finch_request_input, - .close_request = finch_close_request, - .request_choice = finch_request_choice, - .request_action = finch_request_action, - .request_fields = finch_request_fields, - .request_file = finch_request_file, - .request_folder = NULL /* No plans for this */ + finch_request_input, + finch_request_choice, + finch_request_action, + finch_request_fields, + finch_request_file, + finch_close_request, + NULL, /* No plans for request_folder */ + NULL, + NULL, + NULL, + NULL }; PurpleRequestUiOps *finch_request_get_ui_ops()