comparison: libpurple/ft.c
libpurple/ft.c
- changeset 20685
- 039aef89faf6
- parent 20684
- 4daaf3284863
- child 21171
- c6934783d152
equal
deleted
inserted
replaced
| 20684:4daaf3284863 | 20685:039aef89faf6 |
|---|---|
| 307 } | 307 } |
| 308 | 308 |
| 309 static int | 309 static int |
| 310 purple_xfer_choose_file(PurpleXfer *xfer) | 310 purple_xfer_choose_file(PurpleXfer *xfer) |
| 311 { | 311 { |
| 312 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), | 312 purple_request_file_with_hint(xfer, NULL, purple_xfer_get_filename(xfer), |
| 313 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), | 313 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), |
| 314 G_CALLBACK(purple_xfer_choose_file_ok_cb), | 314 G_CALLBACK(purple_xfer_choose_file_ok_cb), |
| 315 G_CALLBACK(purple_xfer_choose_file_cancel_cb), | 315 G_CALLBACK(purple_xfer_choose_file_cancel_cb), |
| 316 purple_xfer_get_account(xfer), xfer->who, NULL, | 316 purple_xfer_get_account(xfer), xfer->who, NULL, |
| 317 "xfer", xfer); | 317 "xfer", xfer); |
| 357 | 357 |
| 358 if (xfer->message != NULL) | 358 if (xfer->message != NULL) |
| 359 serv_got_im(purple_account_get_connection(xfer->account), | 359 serv_got_im(purple_account_get_connection(xfer->account), |
| 360 xfer->who, xfer->message, 0, time(NULL)); | 360 xfer->who, xfer->message, 0, time(NULL)); |
| 361 | 361 |
| 362 purple_request_accept_cancel(xfer, NULL, buf, NULL, | 362 purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL, |
| 363 PURPLE_DEFAULT_ACTION_NONE, | 363 PURPLE_DEFAULT_ACTION_NONE, |
| 364 xfer->account, xfer->who, NULL, | 364 xfer->account, xfer->who, NULL, |
| 365 "xfer", xfer, | 365 "xfer", xfer, |
| 366 G_CALLBACK(purple_xfer_choose_file), | 366 G_CALLBACK(purple_xfer_choose_file), |
| 367 G_CALLBACK(cancel_recv_cb)); | 367 G_CALLBACK(cancel_recv_cb)); |
| 400 purple_xfer_get_remote_port(xfer)) | 400 purple_xfer_get_remote_port(xfer)) |
| 401 buf2 = g_strdup_printf(_("A file is available for download from:\n" | 401 buf2 = g_strdup_printf(_("A file is available for download from:\n" |
| 402 "Remote host: %s\nRemote port: %d"), | 402 "Remote host: %s\nRemote port: %d"), |
| 403 purple_xfer_get_remote_ip(xfer), | 403 purple_xfer_get_remote_ip(xfer), |
| 404 purple_xfer_get_remote_port(xfer)); | 404 purple_xfer_get_remote_port(xfer)); |
| 405 purple_request_accept_cancel(xfer, NULL, buf, buf2, | 405 purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2, |
| 406 PURPLE_DEFAULT_ACTION_NONE, | 406 PURPLE_DEFAULT_ACTION_NONE, |
| 407 xfer->account, xfer->who, NULL, | 407 xfer->account, xfer->who, NULL, |
| 408 "xfer", xfer, | 408 "xfer", xfer, |
| 409 G_CALLBACK(ask_accept_ok), | 409 G_CALLBACK(ask_accept_ok), |
| 410 G_CALLBACK(ask_accept_cancel)); | 410 G_CALLBACK(ask_accept_cancel)); |
