Mercurial > pidgin.yaz
changeset 21872:050218f87c21
Sadrul informs me that cancel_cb may in fact be NULL.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Tue, 18 Dec 2007 16:57:21 +0000 |
| parents | 91684de72a5c |
| children | 5e23a3d7efef |
| files | libpurple/request.c libpurple/request.h |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/request.c Tue Dec 18 16:10:22 2007 +0000 +++ b/libpurple/request.c Tue Dec 18 16:57:21 2007 +0000 @@ -1209,7 +1209,6 @@ g_return_val_if_fail(ok_text != NULL, NULL); g_return_val_if_fail(ok_cb != NULL, NULL); g_return_val_if_fail(cancel_text != NULL, NULL); - g_return_val_if_fail(cancel_cb != NULL, NULL); ops = purple_request_get_ui_ops();
--- a/libpurple/request.h Tue Dec 18 16:10:22 2007 +0000 +++ b/libpurple/request.h Tue Dec 18 16:57:21 2007 +0000 @@ -1241,8 +1241,8 @@ * NULL. * @param cancel_text The text for the @c Cancel button, which may not be @c * NULL. - * @param cancel_cb The callback for the @c Cancel button, which may not be - * @c NULL. + * @param cancel_cb The callback for the @c Cancel button, or @c NULL to + * do nothing. * @param account The #PurpleAccount associated with this request, or @c * NULL if none is. * @param who The username of the buddy assonciated with this request, @@ -1281,8 +1281,8 @@ * NULL. * @param cancel_text The text for the @c Cancel button, which may not be @c * NULL. - * @param cancel_cb The callback for the @c Cancel button, which may not be - * @c NULL. + * @param cancel_cb The callback for the @c Cancel button, or @c NULL to do + * nothing. * @param account The #PurpleAccount associated with this request, or @c * NULL if none is * @param who The username of the buddy assonciated with this request,