comparison libpurple/protocols/yahoo/yahoo_filexfer.c @ 27892:d477b5b53660

propagate from branch 'im.pidgin.pidgin' (head a77a8a85e623af608434736b9e63cc17507ec60c) to branch 'im.pidgin.pidgin.yaz' (head b6620638db9843c51a3140a4bc83482b0a69bd11)

24126:43164dadf922

static void yahoo_sendfile_connected(gpointer data, gint source, const gchar *error_message)
{
	PurpleXfer *xfer;
	struct yahoo_xfer_data *xd;
	struct yahoo_packet *pkt;
	gchar *size, *filename, *encoded_filename, *header;
	guchar *pkt_buf;
	const char *host;
	int port;
	size_t content_length, header_len, pkt_buf_len;
	PurpleConnection *gc;
	PurpleAccount *account;
	struct yahoo_data *yd;

	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
			   "AAA - in yahoo_sendfile_connected\n");
	if (!(xfer = data))
		return;

	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
		YAHOO_STATUS_AVAILABLE, yd->session_id);

	size = g_strdup_printf("%" G_GSIZE_FORMAT, purple_xfer_get_size(xfer));
	filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));
	encoded_filename = yahoo_string_encode(gc, filename, NULL);

	yahoo_packet_hash(pkt, "sssss", 0, purple_connection_get_display_name(gc),
	  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
	g_free(size);
	g_free(encoded_filename);

{
	PurpleXfer *xfer;
	struct yahoo_xfer_data *xd;
	struct sockaddr_in *addr;
	struct yahoo_packet *pkt;
	long actaddr;
	long a,b,c,d;
	PurpleConnection *gc;
	PurpleAccount *account;
	struct yahoo_data *yd;
	gchar *url;
	gchar *filename;

	/* To determine if we should use yahoo p15 for transfer.  Check other user's
	 * reported version, but if we're on Yahoo Japan, ignore it. */
	if(yf && yf->version_id > 500000 && !yd->jp)
		ver = 15; 

	g_return_if_fail(xfer != NULL);

	if(ver == 15) {
		xfer_data = xfer->data;

27892:d477b5b53660

static void yahoo_sendfile_connected(gpointer data, gint source, const gchar *error_message)
{
	PurpleXfer *xfer;
	struct yahoo_xfer_data *xd;
	struct yahoo_packet *pkt;
	gchar *size, *filename, *encoded_filename, *header, *tmp = NULL;
	guchar *pkt_buf;
	const char *host;
	int port;
	size_t content_length, header_len, pkt_buf_len;
	PurpleConnection *gc;
	PurpleAccount *account;
	struct yahoo_data *yd;
	gsize dummy;

	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
			   "AAA - in yahoo_sendfile_connected\n");
	if (!(xfer = data))
		return;

	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
		YAHOO_STATUS_AVAILABLE, yd->session_id);

	size = g_strdup_printf("%" G_GSIZE_FORMAT, purple_xfer_get_size(xfer));

	/* yaz */
	tmp = g_filename_display_basename(purple_xfer_get_local_filename(xfer));
	filename = botch_utf(tmp, strlen(tmp), &dummy);
	g_free(tmp);
	encoded_filename = yahoo_string_encode(gc, filename, NULL); // this takes utf8 as input. --yaz

	yahoo_packet_hash(pkt, "sssss", 0, purple_connection_get_display_name(gc),
	  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
	g_free(size);
	g_free(encoded_filename);

{
	PurpleXfer *xfer;
	struct yahoo_xfer_data *xd;
	struct sockaddr_in *addr;
	struct yahoo_packet *pkt;
	unsigned long actaddr;
	unsigned long a,b,c,d;
	PurpleConnection *gc;
	PurpleAccount *account;
	struct yahoo_data *yd;
	gchar *url;
	gchar *filename;

	/* To determine if we should use yahoo p15 for transfer.  Check other user's
	 * reported version, but if we're on Yahoo Japan, ignore it. */
	if(yf && yf->version_id > 500000 && !yd->jp)
		ver = 15; 

	/* recent yahoo japan --yaz */
	if(yd->jp && yf && yf->version_id > 500000)
		ver = 15;

	g_return_if_fail(xfer != NULL);

	if(ver == 15) {
		xfer_data = xfer->data;