Mercurial > pidgin
comparison libpurple/ft.c @ 29790:d0588e403877
Show thumbnail in ft request dialog
New function to create an action request with a PRPL-supplied icon.
Perhaps all macros in request.h should be augmented to supply versions for
_with_icon
As of now, there is only one, needed for file transfers...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sat, 04 Jul 2009 21:45:19 +0000 |
parents | 3882d419e628 |
children | 8b452039c329 |
comparison
equal
deleted
inserted
replaced
29789:4beb825ff4bc | 29790:d0588e403877 |
---|---|
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 |