Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/data.c	Fri Sep 06 23:02:04 2013 +0530
+++ b/libpurple/protocols/jabber/data.c	Sat Sep 07 00:11:42 2013 +0530
@@ -78,7 +78,7 @@
 
 
 JabberData *
-jabber_data_create_from_xml(xmlnode *tag)
+jabber_data_create_from_xml(PurpleXmlNode *tag)
 {
 	JabberData *data;
 	gchar *raw_data = NULL;
@@ -92,15 +92,15 @@
 		return NULL;
 	}
 
-	cid = xmlnode_get_attrib(tag, "cid");
-	type = xmlnode_get_attrib(tag, "type");
+	cid = purple_xmlnode_get_attrib(tag, "cid");
+	type = purple_xmlnode_get_attrib(tag, "type");
 
 	if (!cid || !type) {
 		purple_debug_error("jabber", "cid or type missing\n");
 		return NULL;
 	}
 
-	raw_data = xmlnode_get_data(tag);
+	raw_data = purple_xmlnode_get_data(tag);
 
 	if (raw_data == NULL || *raw_data == '\0') {
 		purple_debug_error("jabber", "data element was empty");
@@ -165,54 +165,54 @@
 	return data->data;
 }
 
-xmlnode *
+PurpleXmlNode *
 jabber_data_get_xml_definition(const JabberData *data)
 {
-	xmlnode *tag;
+	PurpleXmlNode *tag;
 	char *base64data;
 
 	g_return_val_if_fail(data != NULL, NULL);
 
-	tag = xmlnode_new("data");
+	tag = purple_xmlnode_new("data");
 	base64data = purple_base64_encode(data->data, data->size);
 
-	xmlnode_set_namespace(tag, NS_BOB);
-	xmlnode_set_attrib(tag, "cid", data->cid);
-	xmlnode_set_attrib(tag, "type", data->type);
+	purple_xmlnode_set_namespace(tag, NS_BOB);
+	purple_xmlnode_set_attrib(tag, "cid", data->cid);
+	purple_xmlnode_set_attrib(tag, "type", data->type);
 
-	xmlnode_insert_data(tag, base64data, -1);
+	purple_xmlnode_insert_data(tag, base64data, -1);
 
 	g_free(base64data);
 
 	return tag;
 }
 
-xmlnode *
+PurpleXmlNode *
 jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt)
 {
-	xmlnode *img;
+	PurpleXmlNode *img;
 	char *src;
 
 	g_return_val_if_fail(data != NULL, NULL);
 	g_return_val_if_fail(alt != NULL, NULL);
 
-	img = xmlnode_new("img");
-	xmlnode_set_attrib(img, "alt", alt);
+	img = purple_xmlnode_new("img");
+	purple_xmlnode_set_attrib(img, "alt", alt);
 
 	src = g_strconcat("cid:", data->cid, NULL);
-	xmlnode_set_attrib(img, "src", src);
+	purple_xmlnode_set_attrib(img, "src", src);
 	g_free(src);
 
 	return img;
 }
 
-static xmlnode *
+static PurpleXmlNode *
 jabber_data_get_xml_request(const gchar *cid)
 {
-	xmlnode *tag = xmlnode_new("data");
+	PurpleXmlNode *tag = purple_xmlnode_new("data");
 
-	xmlnode_set_namespace(tag, NS_BOB);
-	xmlnode_set_attrib(tag, "cid", cid);
+	purple_xmlnode_set_namespace(tag, NS_BOB);
+	purple_xmlnode_set_attrib(tag, "cid", cid);
 
 	return tag;
 }
@@ -276,7 +276,7 @@
 
 static void
 jabber_data_request_cb(JabberStream *js, const char *from,
-	JabberIqType type, const char *id, xmlnode *packet, gpointer data)
+	JabberIqType type, const char *id, PurpleXmlNode *packet, gpointer data)
 {
 	JabberDataRequestData *request_data = (JabberDataRequestData *) data;
 	gpointer userdata = request_data->userdata;
@@ -284,8 +284,8 @@
 	gboolean ephemeral = request_data->ephemeral;
 	JabberDataRequestCallback *cb = request_data->cb;
 
-	xmlnode *data_element = xmlnode_get_child(packet, "data");
-	xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found");
+	PurpleXmlNode *data_element = purple_xmlnode_get_child(packet, "data");
+	PurpleXmlNode *item_not_found = purple_xmlnode_get_child(packet, "item-not-found");
 
 	/* did we get a data element as result? */
 	if (data_element && type == JABBER_IQ_RESULT) {
@@ -313,7 +313,7 @@
     gpointer userdata)
 {
 	JabberIq *request;
-	xmlnode *data_request;
+	PurpleXmlNode *data_request;
 	JabberDataRequestData *data;
 
 	g_return_if_fail(cid != NULL);
@@ -329,9 +329,9 @@
 	data->ephemeral = ephemeral;
 	data->cb = cb;
 
-	xmlnode_set_attrib(request->node, "to", who);
+	purple_xmlnode_set_attrib(request->node, "to", who);
 	jabber_iq_set_callback(request, jabber_data_request_cb, data);
-	xmlnode_insert_child(request->node, data_request);
+	purple_xmlnode_insert_child(request->node, data_request);
 	jabber_iq_send(request);
 }
 
@@ -404,26 +404,26 @@
 
 void
 jabber_data_parse(JabberStream *js, const char *who, JabberIqType type,
-                  const char *id, xmlnode *data_node)
+                  const char *id, PurpleXmlNode *data_node)
 {
 	JabberIq *result = NULL;
-	const char *cid = xmlnode_get_attrib(data_node, "cid");
+	const char *cid = purple_xmlnode_get_attrib(data_node, "cid");
 	const JabberData *data = cid ? jabber_data_find_local_by_cid(cid) : NULL;
 
 	if (!data) {
-		xmlnode *item_not_found = xmlnode_new("item-not-found");
+		PurpleXmlNode *item_not_found = purple_xmlnode_new("item-not-found");
 
 		result = jabber_iq_new(js, JABBER_IQ_ERROR);
 		if (who)
-			xmlnode_set_attrib(result->node, "to", who);
-		xmlnode_set_attrib(result->node, "id", id);
-		xmlnode_insert_child(result->node, item_not_found);
+			purple_xmlnode_set_attrib(result->node, "to", who);
+		purple_xmlnode_set_attrib(result->node, "id", id);
+		purple_xmlnode_insert_child(result->node, item_not_found);
 	} else {
 		result = jabber_iq_new(js, JABBER_IQ_RESULT);
 		if (who)
-			xmlnode_set_attrib(result->node, "to", who);
-		xmlnode_set_attrib(result->node, "id", id);
-		xmlnode_insert_child(result->node,
+			purple_xmlnode_set_attrib(result->node, "to", who);
+		purple_xmlnode_set_attrib(result->node, "id", id);
+		purple_xmlnode_insert_child(result->node,
 							 jabber_data_get_xml_definition(data));
 		/* if the data object is temporary, destroy it and remove the references
 		 to it */