comparison src/ft.c @ 11084:2c21bffa8200

[gaim-migrate @ 13103] OSCAR file transfers now work for users behind the same NAT. This should be useful to users of corporate and campus networks. Users of AIM and ICQ 5.02 and newer will see the benefits of this change. Gaim will now try the IP address that the AOL servers see for the sender for 15 seconds (the verified IP), then try the IP address that the sender sees for itself (client IP). The file transfer times out if that fails after an additional 15 seconds. Also, a few more status messages regarding the file transfer are now sent to the conversation window. committer: Tailor Script <[e-mail]>

11083:8faabf4081ca

	g_return_if_fail(xfer != NULL);

	xfer->status = status;
}

static void
gaim_xfer_conversation_write(GaimXfer *xfer, char *message, gboolean is_error)
{
	GaimConversation *conv = NULL;
	GaimMessageFlags flags = GAIM_MESSAGE_SYSTEM;
	char *escaped;

	gaim_xfer_ref(xfer);

	if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
		if (gaim_xfer_get_filename(xfer) ||
		    gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_ACCEPTED)
			gaim_xfer_ask_recv(xfer);
		else
			gaim_xfer_ask_accept(xfer);
	} else
		gaim_xfer_choose_file(xfer);
}

void

11084:2c21bffa8200

	g_return_if_fail(xfer != NULL);

	xfer->status = status;
}

void gaim_xfer_conversation_write(GaimXfer *xfer, char *message, gboolean is_error)
{
	GaimConversation *conv = NULL;
	GaimMessageFlags flags = GAIM_MESSAGE_SYSTEM;
	char *escaped;

	gaim_xfer_ref(xfer);

	if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
		if (gaim_xfer_get_filename(xfer) ||
		    gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_ACCEPTED) {
			gchar* message = NULL;
			message = g_strdup_printf(_("%s is offering to send file %s"),
				xfer->who, gaim_xfer_get_filename(xfer));
			gaim_xfer_conversation_write(xfer, message, FALSE);
			g_free(message);
			gaim_xfer_ask_recv(xfer);
		} else {
			gaim_xfer_ask_accept(xfer);
		}
	} else
		gaim_xfer_choose_file(xfer);
}

void