# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1198002795 0
# Node ID c2af0701d9cce41e081c176380a7b1ac22aee1eb
# Parent  5e23a3d7efef78b349f7781ad4b5731012540904
cancel_cb can be NULL here too.
We probably want to force non-NULL ok_cb for _request_file and _request_folder.

diff -r 5e23a3d7efef -r c2af0701d9cc libpurple/request.c
--- a/libpurple/request.c	Tue Dec 18 17:03:13 2007 +0000
+++ b/libpurple/request.c	Tue Dec 18 18:33:15 2007 +0000
@@ -1298,7 +1298,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 5e23a3d7efef -r c2af0701d9cc libpurple/request.h
--- a/libpurple/request.h	Tue Dec 18 17:03:13 2007 +0000
+++ b/libpurple/request.h	Tue Dec 18 18:33:15 2007 +0000
@@ -1203,7 +1203,7 @@
  *                      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
+ * @param cancel_cb     The callback for the @c Cancel button, which may be
  *                      @c NULL.
  * @param account       The #PurpleAccount associated with this request, or @c
  *                      NULL if none is.
@@ -1396,7 +1396,7 @@
  *                    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
+ * @param cancel_cb   The callback for the @c Cancel button, which may be
  *                    @c NULL.
  * @param account     The #PurpleAccount associated with this request, or @c
  *                    NULL if none is
@@ -1476,7 +1476,7 @@
  * @param savedialog  True if this dialog is being used to save a file.
  *                    False if it is being used to open a file.
  * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
+ * @param cancel_cb   The callback for the @c Cancel button, which may be @c NULL.
  * @param account     The #PurpleAccount associated with this request, or @c
  *                    NULL if none is
  * @param who         The username of the buddy associated with this request,
@@ -1503,7 +1503,7 @@
  *                    no title.
  * @param dirname     The default directory name (may be @c NULL)
  * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
+ * @param cancel_cb   The callback for the @c Cancel button, which may be @c NULL.
  * @param account     The #PurpleAccount associated with this request, or @c
  *                    NULL if none is
  * @param who         The username of the buddy associated with this request,