pidgin3: comparison src/protocols/jabber/jabber.c

-:b3858e2cfcbc
+:7761492245e6
 	int priority;
 	int state;
 	char *away_msg;
 	char *thread_id;
 	gboolean has_composing;
+	gboolean has_xhtml;
 } *jab_res_info;
 /*
 * For our own jid handling
 *
 		g_free(who);
 		if(!jri) {
 			jri = g_new0(struct jabber_resource_info, 1);
 			jri->name = g_strdup(res);
 			jri->away_msg = NULL;
+			jri->has_xhtml = TRUE;
 			jbd->resources = g_slist_append(jbd->resources, jri);
 		}
 		jri->priority = priority;
 		jri->state = state;
 	}
 static void jabber_handlemessage(gjconn gjc, jpacket p)
 {
 	xmlnode y, subj;
 	time_t time_sent = time(NULL);
 	gboolean typing = FALSE;
+	gboolean has_xhtml = TRUE;
 	char *from = NULL, *msg = NULL, *type = NULL, *topic = NULL;
 	char *thread_id = NULL;
 	char *conference_room = NULL;
 	char m[BUF_LONG * 2];
 	}
 	if (!type || !strcasecmp(type, "normal") || !strcasecmp(type, "chat")) {
 		from = jid_full(p->from);
-		/*
 		if ((y = xmlnode_get_tag(p->x, "html"))) {
+			msg = xmlnode2str(y);
+		} else if ((y = xmlnode_get_tag(p->x, "body"))) {
 			msg = xmlnode_get_data(y);
-		} else
+			has_xhtml = FALSE;
-		*/
-		if ((y = xmlnode_get_tag(p->x, "body"))) {
-			msg = xmlnode_get_data(y);
 		}
 		if (!from)
 			return;
 								 gaim_chat_get_id(GAIM_CHAT(jc->b)),
 								 p->from->resource, 1, m, time_sent);
 			else {
 				int flags = 0;
 				jab_res_info jri = jabber_find_resource(GJ_GC(gjc), from);
-				if(jri && typing)
+				if(jri) {
-					jri->has_composing = TRUE;
+					if(typing)
+						jri->has_composing = TRUE;
+					jri->has_xhtml = has_xhtml;
+				}
 				if (xmlnode_get_tag(p->x, "gaim"))
 					flags = IM_FLAG_GAIMUSER;
 				jabber_track_convo_thread(gjc, from, thread_id);
 				if (gaim_find_conversation(from))
 					serv_got_im(GJ_GC(gjc), from, m, flags,
 		}
 	} else if (!strcasecmp(type, "groupchat")) {
 		struct jabber_chat *jc;
 		static int i = 0;
-		/*
 		if ((y = xmlnode_get_tag(p->x, "html"))) {
-			msg = xmlnode_get_data(y);
+			msg = xmlnode2str(y);
-		} else
+		} else if ((y = xmlnode_get_tag(p->x, "body"))) {
-		*/
-		if ((y = xmlnode_get_tag(p->x, "body"))) {
 			msg = xmlnode_get_data(y);
 		}
 		if ((subj = xmlnode_get_tag(p->x, "subject"))) {
 			topic = xmlnode_get_data(subj);
 	xmlnode_free(x);
 	g_free(realwho);
 	return JABBER_TYPING_NOTIFY_INT;
 }
+static void insert_message(xmlnode x, const char *message, gboolean use_xhtml) {
+	xmlnode y;
+	char *buf = strip_html(message);
+	y = xmlnode_insert_tag(x, "body");
+	xmlnode_insert_cdata(y, buf, -1);
+	g_free(buf);
+	if(use_xhtml) {
+		char *buf2 = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body>%s</body></html>", message);
+		buf = html_to_xhtml(buf2);
+		g_free(buf2);
+		y = xmlnode_str(buf, strlen(buf));
+		if(y) {
+			xmlnode_insert_tag_node(x, y);
+			xmlnode_free(y);
+		} else {
+			debug_printf("holy cow, html_to_xhtml didn't work right!\n");
+			debug_printf("the invalid XML: %s\n", buf);
+		}
+		g_free(buf);
+	}
+}
 static int jabber_send_im(struct gaim_connection *gc, char *who, char *message, int len, int flags)
 {
 	xmlnode x, y;
 	char *thread_id = NULL;
 	gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+	jab_res_info jri = jabber_find_resource(gc, who);
 	if (!who || !message)
 		return 0;
 	x = xmlnode_new_tag("message");
 	y = xmlnode_insert_tag(x, "x");
 	xmlnode_put_attrib(y, "xmlns", "jabber:x:event");
 	xmlnode_insert_tag(y, "composing");
 	if (message && strlen(message)) {
-		y = xmlnode_insert_tag(x, "body");
+		insert_message(x, message, jri ? jri->has_xhtml : TRUE);
-		xmlnode_insert_cdata(y, message, -1);
 	}
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
 	xmlnode_free(x);
 	return 1;
 	subject = g_strdup_printf("%s@%s", jc->gjid->user, jc->gjid->server);
 	xmlnode_put_attrib(y, "jid", subject);
 	g_free(subject);
 	if (message && strlen(message)) {
-		y = xmlnode_insert_tag(x, "body");
+		insert_message(x, message, FALSE);
-		xmlnode_insert_cdata(y, message, -1);
 	}
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
 	xmlnode_free(x);
 }
 		xmlnode_insert_cdata(y, message + strlen("/topic "), -1);
 		y = xmlnode_insert_tag(x, "body");
 		g_snprintf(buf, sizeof(buf), "/me has changed the subject to: %s", message + strlen("/topic"));
 		xmlnode_insert_cdata(y, buf, -1);
 	} else if (message && strlen(message)) {
-		y = xmlnode_insert_tag(x, "body");
+		insert_message(x, message, FALSE);
-		xmlnode_insert_cdata(y, message, -1);
 	}
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
 	xmlnode_free(x);
 	return 0;
 }
 static void jabber_chat_whisper(struct gaim_connection *gc, int id, char *who, char *message)
 {
-	xmlnode x, y;
+	xmlnode x;
 	struct jabber_chat *jc = NULL;
 	char *chatname;
 	/* Find out which chat we're whispering to */
 	if(jabber_find_chat_by_convo_id(gc, id, &jc) != 0)
 	xmlnode_put_attrib(x, "to", chatname);
 	g_free(chatname);
 	xmlnode_put_attrib(x, "type", "normal");
 	if (message && strlen(message)) {
-		y = xmlnode_insert_tag(x, "body");
+		insert_message(x, message, FALSE);
-		xmlnode_insert_cdata(y, message, -1);
 	}
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
 	xmlnode_free(x);
 }

Mercurial > pidgin3 / file comparison

comparison: src/protocols/jabber/jabber.c

src/protocols/jabber/jabber.c