comparison: libpurple/ft.c
libpurple/ft.c
- branch
- cpw.malu.ft_thumbnails
- changeset 27427
- 00f91afbd4d9
- parent 27419
- 5cdc131e86a2
- child 27754
- ebe2fa742d5c
equal
deleted
inserted
replaced
| 27426:bf461113e8be | 27427:00f91afbd4d9 |
|---|---|
| 359 | 359 |
| 360 if (xfer->message != NULL) | 360 if (xfer->message != NULL) |
| 361 serv_got_im(purple_account_get_connection(xfer->account), | 361 serv_got_im(purple_account_get_connection(xfer->account), |
| 362 xfer->who, xfer->message, 0, time(NULL)); | 362 xfer->who, xfer->message, 0, time(NULL)); |
| 363 | 363 |
| 364 purple_request_accept_cancel(xfer, NULL, buf, NULL, | 364 if (purple_xfer_get_thumbnail_data(xfer)) { |
| 365 PURPLE_DEFAULT_ACTION_NONE, | 365 purple_request_accept_cancel_with_icon(xfer, NULL, buf, NULL, |
| 366 xfer->account, xfer->who, NULL, | 366 PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, |
| 367 xfer, | 367 purple_xfer_get_thumbnail_data(xfer), |
| 368 G_CALLBACK(purple_xfer_choose_file), | 368 purple_xfer_get_thumbnail_size(xfer), xfer, |
| 369 G_CALLBACK(cancel_recv_cb)); | 369 G_CALLBACK(purple_xfer_choose_file), |
| 370 | 370 G_CALLBACK(cancel_recv_cb)); |
| 371 } else { | |
| 372 purple_request_accept_cancel(xfer, NULL, buf, NULL, | |
| 373 PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, | |
| 374 xfer, G_CALLBACK(purple_xfer_choose_file), | |
| 375 G_CALLBACK(cancel_recv_cb)); | |
| 376 } | |
| 377 | |
| 371 g_free(buf); | 378 g_free(buf); |
| 372 } else | 379 } else |
| 373 purple_xfer_choose_file(xfer); | 380 purple_xfer_choose_file(xfer); |
| 374 } | 381 } |
| 375 | 382 |
