comparison libpurple/protocols/oscar/oft.c @ 32827:4a34689eeb33 default tip

merged from im.pidgin.pidgin

32692:0f94ec89f0bc

	if (!purple_xfer_is_completed(conn->xfer))
		purple_xfer_set_completed(conn->xfer, TRUE);

	purple_input_remove(conn->watcher_incoming);
	conn->watcher_incoming = 0;
	conn->xfer->fd = conn->fd;
	conn->fd = -1;
	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
	peer_connection_schedule_destroy(conn, conn->disconnect_reason, NULL);
}

	PeerConnection *conn;

	conn = purple_xfer_get_protocol_data(xfer);

	/* Tell the other person that we've received everything */
	conn->fd = conn->xfer->fd;
	conn->xfer->fd = -1;
	peer_oft_send_done(conn);

	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
	conn->sending_data_timer = purple_timeout_add(100,
			destroy_connection_when_done_sending_data, conn);

void
peer_oft_sendcb_init(PurpleXfer *xfer)
{
	PeerConnection *conn;
	size_t size;
	gchar *f1 = NULL, *f2 = NULL;
	gsize dummy;

	conn = purple_xfer_get_protocol_data(xfer);
	conn->flags |= PEER_CONNECTION_FLAG_APPROVED;

	 * If we're done sending, intercept the socket from the core ft code
	 * and wait for the other guy to send the "done" OFT packet.
	 */
	if (purple_xfer_get_bytes_remaining(xfer) <= 0)
	{
		purple_input_remove(xfer->watcher);
		conn->fd = xfer->fd;
		xfer->fd = -1;
		conn->watcher_incoming = purple_input_add(conn->fd,
				PURPLE_INPUT_READ, peer_connection_recv_cb, conn);
	}
}

32827:4a34689eeb33

	if (!purple_xfer_is_completed(conn->xfer))
		purple_xfer_set_completed(conn->xfer, TRUE);

	purple_input_remove(conn->watcher_incoming);
	conn->watcher_incoming = 0;
	purple_xfer_set_fd(conn->xfer, conn->fd);
	conn->fd = -1;
	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
	peer_connection_schedule_destroy(conn, conn->disconnect_reason, NULL);
}

	PeerConnection *conn;

	conn = purple_xfer_get_protocol_data(xfer);

	/* Tell the other person that we've received everything */
	conn->fd = purple_xfer_get_fd(conn->xfer);
	purple_xfer_set_fd(conn->xfer, -1);
	peer_oft_send_done(conn);

	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
	conn->sending_data_timer = purple_timeout_add(100,
			destroy_connection_when_done_sending_data, conn);

void
peer_oft_sendcb_init(PurpleXfer *xfer)
{
	PeerConnection *conn;
	goffset size;
	gchar *f1 = NULL, *f2 = NULL;
	gsize dummy;

	conn = purple_xfer_get_protocol_data(xfer);
	conn->flags |= PEER_CONNECTION_FLAG_APPROVED;

	 * If we're done sending, intercept the socket from the core ft code
	 * and wait for the other guy to send the "done" OFT packet.
	 */
	if (purple_xfer_get_bytes_remaining(xfer) <= 0)
	{
		purple_input_remove(purple_xfer_get_watcher(xfer));
		conn->fd = purple_xfer_get_fd(xfer);
		purple_xfer_set_fd(xfer, -1);
		conn->watcher_incoming = purple_input_add(conn->fd,
				PURPLE_INPUT_READ, peer_connection_recv_cb, conn);
	}
}