Mercurial > pidgin.yaz
diff libpurple/ft.c @ 21076:b84655373d7b
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 |
line wrap: on
line diff
--- a/libpurple/ft.c Sun Oct 07 00:49:17 2007 +0000 +++ b/libpurple/ft.c Mon Oct 08 16:06:39 2007 +0000 @@ -309,12 +309,12 @@ static int purple_xfer_choose_file(PurpleXfer *xfer) { - purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), + purple_request_file_with_hint(xfer, NULL, purple_xfer_get_filename(xfer), (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), G_CALLBACK(purple_xfer_choose_file_ok_cb), G_CALLBACK(purple_xfer_choose_file_cancel_cb), purple_xfer_get_account(xfer), xfer->who, NULL, - xfer); + "xfer", xfer); return 0; } @@ -359,10 +359,10 @@ serv_got_im(purple_account_get_connection(xfer->account), xfer->who, xfer->message, 0, time(NULL)); - purple_request_accept_cancel(xfer, NULL, buf, NULL, + purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - xfer, + "xfer", xfer, G_CALLBACK(purple_xfer_choose_file), G_CALLBACK(cancel_recv_cb)); @@ -402,10 +402,10 @@ "Remote host: %s\nRemote port: %d"), purple_xfer_get_remote_ip(xfer), purple_xfer_get_remote_port(xfer)); - purple_request_accept_cancel(xfer, NULL, buf, buf2, + purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - xfer, + "xfer", xfer, G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); g_free(buf);