Mercurial > pidgin.yaz
comparison src/ft.c @ 9976:f4ff7d2b9b2c
[gaim-migrate @ 10887]
Dave West fixed a few things from his patch to remove the
default action for certain dialogs that pop-up
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 08 Sep 2004 03:59:17 +0000 |
parents | 426b623ffe16 |
children | 0aca774bef87 |
comparison
equal
deleted
inserted
replaced
9975:c66345b33b88 | 9976:f4ff7d2b9b2c |
---|---|
262 | 262 |
263 if (xfer->message != NULL) | 263 if (xfer->message != NULL) |
264 serv_got_im(gaim_account_get_connection(xfer->account), | 264 serv_got_im(gaim_account_get_connection(xfer->account), |
265 xfer->who, xfer->message, 0, time(NULL)); | 265 xfer->who, xfer->message, 0, time(NULL)); |
266 | 266 |
267 gaim_request_accept_cancel(xfer, NULL, buf, NULL, 0, xfer, | 267 gaim_request_accept_cancel(xfer, NULL, buf, NULL, |
268 G_CALLBACK(gaim_xfer_choose_file), | 268 GAIM_DEFAULT_ACTION_NONE, xfer, |
269 G_CALLBACK(cancel_recv_cb)); | 269 G_CALLBACK(gaim_xfer_choose_file), |
270 G_CALLBACK(cancel_recv_cb)); | |
270 | 271 |
271 g_free(buf); | 272 g_free(buf); |
272 } else | 273 } else |
273 gaim_xfer_choose_file(xfer); | 274 gaim_xfer_choose_file(xfer); |
274 } | 275 } |
301 gaim_xfer_get_remote_port(xfer)) | 302 gaim_xfer_get_remote_port(xfer)) |
302 buf2 = g_strdup_printf(_("A file is available for download from:\n" | 303 buf2 = g_strdup_printf(_("A file is available for download from:\n" |
303 "Remote host: %s\nRemote port: %d"), | 304 "Remote host: %s\nRemote port: %d"), |
304 gaim_xfer_get_remote_ip(xfer), | 305 gaim_xfer_get_remote_ip(xfer), |
305 gaim_xfer_get_remote_port(xfer)); | 306 gaim_xfer_get_remote_port(xfer)); |
306 gaim_request_accept_cancel(xfer, NULL, buf, buf2, 0, xfer, | 307 gaim_request_accept_cancel(xfer, NULL, buf, buf2, |
307 G_CALLBACK(ask_accept_ok), | 308 GAIM_DEFAULT_ACTION_NONE, xfer, |
308 G_CALLBACK(ask_accept_cancel)); | 309 G_CALLBACK(ask_accept_ok), |
310 G_CALLBACK(ask_accept_cancel)); | |
309 g_free(buf); | 311 g_free(buf); |
310 g_free(buf2); | 312 g_free(buf2); |
311 } | 313 } |
312 | 314 |
313 void | 315 void |