pidgin: src/protocols/oscar/oscar.c comparison

comparison src/protocols/oscar/oscar.c @ 12216:4d3119205a33

[gaim-migrate @ 14518] Remove GaimConvImFlags and GaimConvChatFlags - use GaimMessageFlags everywhere instead. Add a new GAIM_MESSAGE_IMAGES flag, and set it when sending a message containing images. When sending a message, the core will now always send "html" to the prpls, just like it expects to receive html from the prpls for received messages. This will allow text prpls such as SILC to support IM images and differentiate them from user input. Previously gaim_unescape_html() was used before passing the message to the prpl, now the prpl does this itself if it needs it. I think I updated all the prpls correctly, but I'm not so sure about sametime. committer: Tailor Script <tailor@pidgin.im>

author	Stu Tomlinson <stu@nosnilmot.com>
date	Thu, 24 Nov 2005 20:47:46 +0000
parents	2de8b6772d00
children	d3cb077caf3e

comparison

equal deleted inserted replaced

-:31b91bfab029
+:4d3119205a33
 *     <DATA ID="2" SIZE="65978">datadatadatadata</DATA>
 * </BINARY>
 */
 static int gaim_odc_incoming(aim_session_t *sess, aim_frame_t *fr, ...) {
 	GaimConnection *gc = sess->aux_data;
-	GaimConvImFlags imflags = 0;
+	GaimMessageFlags imflags = 0;
 	gchar *utf8;
 	GString *newmsg = g_string_new("");
 	GSList *images = NULL;
 	va_list ap;
 	const char *sn, *msg, *msgend, *binary;
 	gaim_debug_info("oscar",
 			   "Got DirectIM message from %s\n", sn);
 	if (isawaymsg)
-		imflags |= GAIM_CONV_IM_AUTO_RESP;
+		imflags |= GAIM_MESSAGE_AUTO_RESP;
 	/* message has a binary trailer */
 	if ((binary = gaim_strcasestr(msg, "<binary>"))) {
 		GData *attribs;
 		const char *tmp, *start, *end, *last = NULL;
 		if (last++ && (last < binary))
 			newmsg = g_string_append_len(newmsg, last, binary - last);
 		/* set the flag if we caught any images */
 		if (images)
-			imflags |= GAIM_CONV_IM_IMAGES;
+			imflags |= GAIM_MESSAGE_IMAGES;
 	} else {
 		g_string_append_len(newmsg, msg, len);
 	}
 	/* Convert to UTF8 */
 	else
 		serv_got_typing_stopped(gc, sn);
 	return 1;
 }
-static int gaim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *message, GaimConvImFlags imflags) {
+static int gaim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *message, GaimMessageFlags imflags) {
 	char *buf;
 	size_t len;
 	int ret;
 	GString *msg = g_string_new("<HTML><BODY>");
 	GString *data = g_string_new("</BODY></HTML><BINARY>");
 	g_string_free(msg, FALSE);
 	g_string_free(data, TRUE);
 	/* XXX - The last parameter below is the encoding.  Let Paco-Paco do something with it. */
-	if (imflags & GAIM_CONV_IM_AUTO_RESP)
+	if (imflags & GAIM_MESSAGE_AUTO_RESP)
 		ret =  aim_odc_send_im(sess, conn, buf, len, 0, 1);
 	else
 		ret =  aim_odc_send_im(sess, conn, buf, len, 0, 0);
 	g_free(buf);
 static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
 	GaimConnection *gc = sess->aux_data;
 	OscarData *od = gc->proto_data;
 	GaimAccount *account = gaim_connection_get_account(gc);
-	GaimConvImFlags flags = 0;
+	GaimMessageFlags flags = 0;
 	struct buddyinfo *bi;
 	char *iconfile;
 	GString *message;
 	gchar *tmp;
 	aim_mpmsg_section_t *curpart;
 		bi = g_new0(struct buddyinfo, 1);
 		g_hash_table_insert(od->buddyinfo, g_strdup(gaim_normalize(account, userinfo->sn)), bi);
 	}
 	if (args->icbmflags & AIM_IMFLAGS_AWAY)
-		flags |= GAIM_CONV_IM_AUTO_RESP;
+		flags |= GAIM_MESSAGE_AUTO_RESP;
 	if (args->icbmflags & AIM_IMFLAGS_TYPINGNOT)
 		bi->typingnot = TRUE;
 	else
 		bi->typingnot = FALSE;
 		}
 	}
 	return 0;
 }
-static int gaim_odc_send_im(aim_session_t *, aim_conn_t *, const char *, GaimConvImFlags);
+static int gaim_odc_send_im(aim_session_t *, aim_conn_t *, const char *, GaimMessageFlags);
-static int oscar_send_im(GaimConnection *gc, const char *name, const char *message, GaimConvImFlags imflags) {
+static int oscar_send_im(GaimConnection *gc, const char *name, const char *message, GaimMessageFlags imflags) {
 	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;
 	char *iconfile = gaim_buddy_icons_get_full_path(gaim_account_get_buddy_icon(account));
 			args.flags |= AIM_IMFLAGS_OFFLINE;
 		} else {
 			args.features = features_aim;
 			args.featureslen = sizeof(features_aim);
-			if (imflags & GAIM_CONV_IM_AUTO_RESP)
+			if (imflags & GAIM_MESSAGE_AUTO_RESP)
 				args.flags |= AIM_IMFLAGS_AWAY;
 		}
 		if (bi->ico_need) {
 			gaim_debug_info("oscar",
 		 * 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);
+				tmpmsg = gaim_unescape_html(message);
 			else
 				/* From ICQ to AIM */
-				tmpmsg = g_markup_escape_text(message, -1);
+				tmpmsg = g_strdup(message);
 		} else {
 			/* From AIM to AIM and AIM to ICQ */
 			tmpmsg = g_strdup(message);
 		}
 		len = strlen(tmpmsg);
 	cc = find_oscar_chat(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)));
 	oscar_chat_kill(gc, cc);
 }
-static int oscar_send_chat(GaimConnection *gc, int id, const char *message) {
+static int oscar_send_chat(GaimConnection *gc, int id, const char *message, GaimMessageFlags flags) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	GaimConversation *conv = NULL;
 	struct chat_connection *c = NULL;
 	char *buf, *buf2;
 	fu16_t charset, charsubset;

Mercurial > pidgin

comparison src/protocols/oscar/oscar.c @ 12216:4d3119205a33