im.pidgin.pidgin: 3ab4916656603d681043b6a5bcb4426128ac5843

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3ab4916656603d681043b6a5bcb4426128ac5843
Ancestor: 27207534aa820a44faf1f59f06cca4940da831df
Author: sadrul at pidgin.im
Date: 2007-12-18T18:33:15
Branch: im.pidgin.pidgin

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

ChangeLog: 

cancel_cb can be NULL here too.
We probably want to force non-NULL ok_cb for _request_file and _request_folder.

-------------- next part --------------
============================================================
--- libpurple/request.c	b839b196433b8884b3ae7c98ebdbce8aa11b8d12
+++ libpurple/request.c	e86343376dc7ccb6922a25824ebdf02897f82bde
@@ -1298,7 +1298,6 @@ purple_request_fields(void *handle, cons
 	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	bbdc56d306d5fe11bd53abac0e3d41755886d30c
+++ libpurple/request.h	acc633bd74a90bb5dde1a118aca51944f90682c1
@@ -1203,7 +1203,7 @@ PurpleFilterAccountFunc purple_request_f
  *                      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 @@ void *purple_request_action_varg(void *h
  *                    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 @@ void purple_request_close_with_handle(vo
  * @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 @@ void *purple_request_file(void *handle, 
  *                    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,