Mercurial > pidgin.yaz
diff libpurple/ft.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:27:07 +0000 |
| parents | d4f95419be45 73c5f5bfeb39 |
| children | fcb848b2d669 |
line wrap: on
line diff
--- a/libpurple/ft.c Fri Nov 16 23:03:22 2007 +0000 +++ b/libpurple/ft.c Fri Nov 16 23:27:07 2007 +0000 @@ -314,7 +314,7 @@ G_CALLBACK(purple_xfer_choose_file_ok_cb), G_CALLBACK(purple_xfer_choose_file_cancel_cb), purple_xfer_get_account(xfer), xfer->who, NULL, - PURPLE_REQUEST_HINT_XFER, xfer); + "xfer", xfer); return 0; } @@ -362,7 +362,7 @@ purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - PURPLE_REQUEST_HINT_XFER, xfer, + "xfer", xfer, G_CALLBACK(purple_xfer_choose_file), G_CALLBACK(cancel_recv_cb)); @@ -405,7 +405,7 @@ purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - PURPLE_REQUEST_HINT_XFER, xfer, + "xfer", xfer, G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); g_free(buf);