im.pidgin.pidgin: 3dafaa1fdf17238f9e857926a1c4b2710eafde6f

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 3dafaa1fdf17238f9e857926a1c4b2710eafde6f
Ancestor: f60024a049490db3b4b14922c237f7bc7c140045
Author: resiak at soc.pidgin.im
Date: 2007-12-18T16:57:21
Branch: im.pidgin.pidgin

Modified files:
        libpurple/request.c libpurple/request.h

ChangeLog: 

Sadrul informs me that cancel_cb may in fact be NULL.

-------------- next part --------------
============================================================
--- libpurple/request.c	e969dc6380e260c9571c975571560e18441342f7
+++ libpurple/request.c	b839b196433b8884b3ae7c98ebdbce8aa11b8d12
@@ -1209,7 +1209,6 @@ purple_request_choice_varg(void *handle,
 	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();
 
============================================================
--- libpurple/request.h	ccce59a40976baf2ce1839701d9f1b217efc20e2
+++ libpurple/request.h	c580f5a2665067b9f18d607d5ec2a2d0b3e1812f
@@ -1241,8 +1241,8 @@ void *purple_request_input(void *handle,
  *                      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 @@ void *purple_request_choice(void *handle
  *                      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,