Mercurial > pidgin

comparison libpurple/ft.c @ 16439:08db93bbd798

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 26 Apr 2007 12:25:49 +0000
parents 32c366eeeb99
children 21830d70709b
comparison
equal deleted inserted replaced
16435:a46a0362dc34 16439:08db93bbd798
305 purple_xfer_choose_file(PurpleXfer *xfer) 305 purple_xfer_choose_file(PurpleXfer *xfer)
306 { 306 {
307 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), 307 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer),
308 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), 308 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE),
309 G_CALLBACK(purple_xfer_choose_file_ok_cb), 309 G_CALLBACK(purple_xfer_choose_file_ok_cb),
310 G_CALLBACK(purple_xfer_choose_file_cancel_cb), xfer); 310 G_CALLBACK(purple_xfer_choose_file_cancel_cb),
311 purple_xfer_get_account(xfer), xfer->who, NULL,
312 xfer);
311 313
312 return 0; 314 return 0;
313 } 315 }
314 316
315 static int 317 static int
351 if (xfer->message != NULL) 353 if (xfer->message != NULL)
352 serv_got_im(purple_account_get_connection(xfer->account), 354 serv_got_im(purple_account_get_connection(xfer->account),
353 xfer->who, xfer->message, 0, time(NULL)); 355 xfer->who, xfer->message, 0, time(NULL));
354 356
355 purple_request_accept_cancel(xfer, NULL, buf, NULL, 357 purple_request_accept_cancel(xfer, NULL, buf, NULL,
356 PURPLE_DEFAULT_ACTION_NONE, xfer, 358 PURPLE_DEFAULT_ACTION_NONE,
359 xfer->account, xfer->who, NULL,
360 xfer,
357 G_CALLBACK(purple_xfer_choose_file), 361 G_CALLBACK(purple_xfer_choose_file),
358 G_CALLBACK(cancel_recv_cb)); 362 G_CALLBACK(cancel_recv_cb));
359 363
360 g_free(buf); 364 g_free(buf);
361 } else 365 } else
392 buf2 = g_strdup_printf(_("A file is available for download from:\n" 396 buf2 = g_strdup_printf(_("A file is available for download from:\n"
393 "Remote host: %s\nRemote port: %d"), 397 "Remote host: %s\nRemote port: %d"),
394 purple_xfer_get_remote_ip(xfer), 398 purple_xfer_get_remote_ip(xfer),
395 purple_xfer_get_remote_port(xfer)); 399 purple_xfer_get_remote_port(xfer));
396 purple_request_accept_cancel(xfer, NULL, buf, buf2, 400 purple_request_accept_cancel(xfer, NULL, buf, buf2,
397 PURPLE_DEFAULT_ACTION_NONE, xfer, 401 PURPLE_DEFAULT_ACTION_NONE,
402 xfer->account, xfer->who, NULL,
403 xfer,
398 G_CALLBACK(ask_accept_ok), 404 G_CALLBACK(ask_accept_ok),
399 G_CALLBACK(ask_accept_cancel)); 405 G_CALLBACK(ask_accept_cancel));
400 g_free(buf); 406 g_free(buf);
401 g_free(buf2); 407 g_free(buf2);
402 } 408 }