comparison libpurple/request.c @ 21876:2ca7a3d28186

merge of '0bab002372d4ff0eac85fc22d99e014cd044b900' and 'f60024a049490db3b4b14922c237f7bc7c140045'
author Richard Laager <rlaager@wiktel.com>
date Tue, 18 Dec 2007 18:18:31 +0000
parents a92574a57460
children 050218f87c21
comparison
equal deleted inserted replaced
21835:567b77c90a1b 21876:2ca7a3d28186
1206 { 1206 {
1207 PurpleRequestUiOps *ops; 1207 PurpleRequestUiOps *ops;
1208 1208
1209 g_return_val_if_fail(ok_text != NULL, NULL); 1209 g_return_val_if_fail(ok_text != NULL, NULL);
1210 g_return_val_if_fail(ok_cb != NULL, NULL); 1210 g_return_val_if_fail(ok_cb != NULL, NULL);
1211 g_return_val_if_fail(cancel_text != NULL, NULL);
1212 g_return_val_if_fail(cancel_cb != NULL, NULL);
1211 1213
1212 ops = purple_request_get_ui_ops(); 1214 ops = purple_request_get_ui_ops();
1213 1215
1214 if (ops != NULL && ops->request_choice != NULL) { 1216 if (ops != NULL && ops->request_choice != NULL) {
1215 PurpleRequestInfo *info; 1217 PurpleRequestInfo *info;
1294 PurpleRequestUiOps *ops; 1296 PurpleRequestUiOps *ops;
1295 1297
1296 g_return_val_if_fail(fields != NULL, NULL); 1298 g_return_val_if_fail(fields != NULL, NULL);
1297 g_return_val_if_fail(ok_text != NULL, NULL); 1299 g_return_val_if_fail(ok_text != NULL, NULL);
1298 g_return_val_if_fail(ok_cb != NULL, NULL); 1300 g_return_val_if_fail(ok_cb != NULL, NULL);
1301 g_return_val_if_fail(cancel_text != NULL, NULL);
1302 g_return_val_if_fail(cancel_cb != NULL, NULL);
1299 1303
1300 ops = purple_request_get_ui_ops(); 1304 ops = purple_request_get_ui_ops();
1301 1305
1302 if (ops != NULL && ops->request_fields != NULL) { 1306 if (ops != NULL && ops->request_fields != NULL) {
1303 PurpleRequestInfo *info; 1307 PurpleRequestInfo *info;