Mercurial > pidgin

comparison libpurple/ft.c @ 21076:b84655373d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 017296ee954fb91349806c809983c916842603da) to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head ce668a77429a79bf1404086e8f5e7faf7df25856)
author Gabriel Schulhof <nix@go-nix.ca>
date Mon, 08 Oct 2007 16:06:39 +0000
parents 285bb637a2b7
children 8c9aad9479c0
comparison
equal deleted inserted replaced
20811:368d79355aba 21076:b84655373d7b
307 } 307 }
308 308
309 static int 309 static int
310 purple_xfer_choose_file(PurpleXfer *xfer) 310 purple_xfer_choose_file(PurpleXfer *xfer)
311 { 311 {
312 purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), 312 purple_request_file_with_hint(xfer, NULL, purple_xfer_get_filename(xfer),
313 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), 313 (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE),
314 G_CALLBACK(purple_xfer_choose_file_ok_cb), 314 G_CALLBACK(purple_xfer_choose_file_ok_cb),
315 G_CALLBACK(purple_xfer_choose_file_cancel_cb), 315 G_CALLBACK(purple_xfer_choose_file_cancel_cb),
316 purple_xfer_get_account(xfer), xfer->who, NULL, 316 purple_xfer_get_account(xfer), xfer->who, NULL,
317 xfer); 317 "xfer", xfer);
318 318
319 return 0; 319 return 0;
320 } 320 }
321 321
322 static int 322 static int
357 357
358 if (xfer->message != NULL) 358 if (xfer->message != NULL)
359 serv_got_im(purple_account_get_connection(xfer->account), 359 serv_got_im(purple_account_get_connection(xfer->account),
360 xfer->who, xfer->message, 0, time(NULL)); 360 xfer->who, xfer->message, 0, time(NULL));
361 361
362 purple_request_accept_cancel(xfer, NULL, buf, NULL, 362 purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL,
363 PURPLE_DEFAULT_ACTION_NONE, 363 PURPLE_DEFAULT_ACTION_NONE,
364 xfer->account, xfer->who, NULL, 364 xfer->account, xfer->who, NULL,
365 xfer, 365 "xfer", xfer,
366 G_CALLBACK(purple_xfer_choose_file), 366 G_CALLBACK(purple_xfer_choose_file),
367 G_CALLBACK(cancel_recv_cb)); 367 G_CALLBACK(cancel_recv_cb));
368 368
369 g_free(buf); 369 g_free(buf);
370 } else 370 } else
400 purple_xfer_get_remote_port(xfer)) 400 purple_xfer_get_remote_port(xfer))
401 buf2 = g_strdup_printf(_("A file is available for download from:\n" 401 buf2 = g_strdup_printf(_("A file is available for download from:\n"
402 "Remote host: %s\nRemote port: %d"), 402 "Remote host: %s\nRemote port: %d"),
403 purple_xfer_get_remote_ip(xfer), 403 purple_xfer_get_remote_ip(xfer),
404 purple_xfer_get_remote_port(xfer)); 404 purple_xfer_get_remote_port(xfer));
405 purple_request_accept_cancel(xfer, NULL, buf, buf2, 405 purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2,
406 PURPLE_DEFAULT_ACTION_NONE, 406 PURPLE_DEFAULT_ACTION_NONE,
407 xfer->account, xfer->who, NULL, 407 xfer->account, xfer->who, NULL,
408 xfer, 408 "xfer", xfer,
409 G_CALLBACK(ask_accept_ok), 409 G_CALLBACK(ask_accept_ok),
410 G_CALLBACK(ask_accept_cancel)); 410 G_CALLBACK(ask_accept_cancel));
411 g_free(buf); 411 g_free(buf);
412 g_free(buf2); 412 g_free(buf2);
413 } 413 }