comparison src/protocols/oscar/oscar.c @ 10781:f6d630211935

[gaim-migrate @ 12406] My changes from oldstatus dealing with HTML and plaintext messages for AIM and ICQ. Hopefully I didn't miss anything. committer: Tailor Script <[e-mail]>

10780:33fe0093bbba

		curpart = curpart->next;
	}
	tmp = g_string_free(message, FALSE);

	/*
	 * If the message is being received by an ICQ user then escape any HTML,
	 * because HTML is not sent over ICQ as a means to format a message.
	 * so any HTML we receive is intended to be displayed
	 *
	 * Note: There *may* be some clients which send messages as HTML formatted -
	 *       they need to be special-cased somehow.
	 */
	if (aim_sn_is_icq(gaim_account_get_username(account)) && aim_sn_is_icq(userinfo->sn)) {
		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
		gchar *tmp2 = g_markup_escape_text(tmp, -1);
		g_free(tmp);
		tmp = tmp2;
	}

	serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL));

	OscarData *od = (OscarData *)gc->proto_data;
	GaimAccount *account = gaim_connection_get_account(gc);
	struct oscar_direct_im *dim = oscar_direct_im_find(od, name);
	int ret = 0;
	const char *iconfile = gaim_account_get_buddy_icon(account);
	char *tmpmsg = NULL, *tmpmsg2 = NULL;

	if (dim && dim->connected) {
		/* If we're directly connected, send a direct IM */
		ret = gaim_odc_send_im(od->sess, dim->conn, message, imflags);
	} else {

		}

		args.destsn = name;

		/*
		 * If we're IMing an ICQ user then send newlines as CR/LF and
		 * strip all HTML
		 */
		if (aim_sn_is_icq(name) ) {
			/* being sent to an ICQ user */
			if (!aim_sn_is_icq(gaim_account_get_username(account))) {
				/* from an AIM user - ICQ receiving from AIM *expects the messsage to be HTML formatted* */
				tmpmsg = gaim_str_add_cr(message);
			} else {
				/* from an ICQ user - do nothing */
				tmpmsg = g_strdup(message);
			}
		} else {
			/* being sent to an AIM user */
			if (aim_sn_is_icq(gaim_account_get_username(account))) {
				/* from an ICQ user */
				tmpmsg2 = gaim_strdup_withhtml(message);
				tmpmsg = g_markup_escape_text(tmpmsg2, -1);
				g_free(tmpmsg2);
			} else
				tmpmsg = gaim_strdup_withhtml(message);
		}
		len = strlen(tmpmsg);

		gaim_plugin_oscar_convert_to_best_encoding(gc, name, tmpmsg, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
		gaim_debug_info("oscar", "Sending IM, charset=0x%04hx, charsubset=0x%04hx, length=%d\n",

10781:f6d630211935

		curpart = curpart->next;
	}
	tmp = g_string_free(message, FALSE);

	/*
	 * If the message is from an ICQ user and to an ICQ user then escape any HTML,
	 * because HTML is not sent over ICQ as a means to format a message.
	 * So any HTML we receive is intended to be displayed.  Also, \r\n must be
	 * replaced with <br>
	 *
	 * Note: There *may* be some clients which send messages as HTML formatted -
	 *       they need to be special-cased somehow.
	 */
	if (aim_sn_is_icq(gaim_account_get_username(account)) && aim_sn_is_icq(userinfo->sn)) {
		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
		gchar *tmp2 = g_markup_escape_text(tmp, -1);
		g_free(tmp);
		tmp = tmp2;
		gaim_strreplace(tmp, "\r\n", "<br>");
		g_free(tmp);
		tmp = tmp2;
	}

	serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL));

	OscarData *od = (OscarData *)gc->proto_data;
	GaimAccount *account = gaim_connection_get_account(gc);
	struct oscar_direct_im *dim = oscar_direct_im_find(od, name);
	int ret = 0;
	const char *iconfile = gaim_account_get_buddy_icon(account);
	char *tmpmsg = NULL;

	if (dim && dim->connected) {
		/* If we're directly connected, send a direct IM */
		ret = gaim_odc_send_im(od->sess, dim->conn, message, imflags);
	} else {

		}

		args.destsn = name;

		/*
		 * If we're IMing an ICQ user from an ICQ account, then strip HTML
		 * and use \r\n as the newline character.
		 */
		if (aim_sn_is_icq(gaim_account_get_username(account))) {
			if (aim_sn_is_icq(name))
				/* From ICQ to ICQ */
				tmpmsg = g_strdup(message);
			else
				/* From ICQ to AIM */
				tmpmsg = g_markup_escape_text(message, -1);
		} else {
			if (aim_sn_is_icq(name))
				/* From AIM to AIM and AIM to ICQ */
				tmpmsg = g_strdup(message);
		}
		len = strlen(tmpmsg);

		gaim_plugin_oscar_convert_to_best_encoding(gc, name, tmpmsg, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
		gaim_debug_info("oscar", "Sending IM, charset=0x%04hx, charsubset=0x%04hx, length=%d\n",