# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1197997041 0
# Node ID 050218f87c2100c0637e263b2fd9efbfa441751b
# Parent  91684de72a5cb8cb670e5d8fed29aa62c6cc0bae
Sadrul informs me that cancel_cb may in fact be NULL.

diff -r 91684de72a5c -r 050218f87c21 libpurple/request.c
--- 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();
 
diff -r 91684de72a5c -r 050218f87c21 libpurple/request.h
--- 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,