comparison: libpurple/xfer.c
libpurple/xfer.c
- branch
- soc.2013.gobjectification
- changeset 34945
- 54af0dd9faa5
- parent 34940
- c0aef3b64c56
- child 34955
- 854143116575
- child 36715
- 8474ffec0c98
equal
deleted
inserted
replaced
| 34944:0d5d42e2c0d6 | 34945:54af0dd9faa5 |
|---|---|
| 423 | 423 |
| 424 static int | 424 static int |
| 425 purple_xfer_choose_file(PurpleXfer *xfer) | 425 purple_xfer_choose_file(PurpleXfer *xfer) |
| 426 { | 426 { |
| 427 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), | 427 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), |
| 428 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), | 428 (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_RECEIVE), |
| 429 G_CALLBACK(purple_xfer_choose_file_ok_cb), | 429 G_CALLBACK(purple_xfer_choose_file_ok_cb), |
| 430 G_CALLBACK(purple_xfer_choose_file_cancel_cb), | 430 G_CALLBACK(purple_xfer_choose_file_cancel_cb), |
| 431 purple_request_cpar_from_account(purple_xfer_get_account(xfer)), | 431 purple_request_cpar_from_account(purple_xfer_get_account(xfer)), |
| 432 xfer); | 432 xfer); |
| 433 | 433 |
| 476 | 476 |
| 477 if (priv->message != NULL) | 477 if (priv->message != NULL) |
| 478 serv_got_im(purple_account_get_connection(priv->account), | 478 serv_got_im(purple_account_get_connection(priv->account), |
| 479 priv->who, priv->message, 0, time(NULL)); | 479 priv->who, priv->message, 0, time(NULL)); |
| 480 | 480 |
| 481 cpar = purple_request_cpar_from_account(xfer->account); | 481 cpar = purple_request_cpar_from_account(priv->account); |
| 482 if ((thumb = purple_xfer_get_thumbnail(xfer, &thumb_size))) { | 482 if ((thumb = purple_xfer_get_thumbnail(xfer, &thumb_size))) { |
| 483 purple_request_cpar_set_custom_icon(cpar, thumb, | 483 purple_request_cpar_set_custom_icon(cpar, thumb, |
| 484 thumb_size); | 484 thumb_size); |
| 485 } | 485 } |
| 486 | 486 |
| 526 "Remote host: %s\nRemote port: %d"), | 526 "Remote host: %s\nRemote port: %d"), |
| 527 purple_xfer_get_remote_ip(xfer), | 527 purple_xfer_get_remote_ip(xfer), |
| 528 purple_xfer_get_remote_port(xfer)); | 528 purple_xfer_get_remote_port(xfer)); |
| 529 purple_request_accept_cancel(xfer, NULL, buf, buf2, | 529 purple_request_accept_cancel(xfer, NULL, buf, buf2, |
| 530 PURPLE_DEFAULT_ACTION_NONE, | 530 PURPLE_DEFAULT_ACTION_NONE, |
| 531 purple_request_cpar_from_account(xfer->account), xfer, | 531 purple_request_cpar_from_account(priv->account), xfer, |
| 532 G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); | 532 G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); |
| 533 g_free(buf); | 533 g_free(buf); |
| 534 g_free(buf2); | 534 g_free(buf2); |
| 535 } | 535 } |
| 536 | 536 |
