Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/roster.c	Fri Sep 06 23:02:04 2013 +0530
+++ b/libpurple/protocols/jabber/roster.c	Sat Sep 07 00:11:42 2013 +0530
@@ -50,9 +50,9 @@
 
 static void roster_request_cb(JabberStream *js, const char *from,
                               JabberIqType type, const char *id,
-                              xmlnode *packet, gpointer data)
+                              PurpleXmlNode *packet, gpointer data)
 {
-	xmlnode *query;
+	PurpleXmlNode *query;
 
 	if (type == JABBER_IQ_ERROR) {
 		/*
@@ -65,7 +65,7 @@
 		return;
 	}
 
-	query = xmlnode_get_child(packet, "query");
+	query = purple_xmlnode_get_child(packet, "query");
 	if (query == NULL) {
 		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
 		return;
@@ -78,14 +78,14 @@
 void jabber_roster_request(JabberStream *js)
 {
 	JabberIq *iq;
-	xmlnode *query;
+	PurpleXmlNode *query;
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
-	query = xmlnode_get_child(iq->node, "query");
+	query = purple_xmlnode_get_child(iq->node, "query");
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-		xmlnode_set_attrib(query, "gr:ext", "2");
+		purple_xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+		purple_xmlnode_set_attrib(query, "gr:ext", "2");
 	}
 
 	jabber_iq_set_callback(iq, roster_request_cb, NULL);
@@ -188,9 +188,9 @@
 }
 
 void jabber_roster_parse(JabberStream *js, const char *from,
-                         JabberIqType type, const char *id, xmlnode *query)
+                         JabberIqType type, const char *id, PurpleXmlNode *query)
 {
-	xmlnode *item, *group;
+	PurpleXmlNode *item, *group;
 #if 0
 	const char *ver;
 #endif
@@ -203,15 +203,15 @@
 
 	js->currently_parsing_roster_push = TRUE;
 
-	for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item))
+	for(item = purple_xmlnode_get_child(query, "item"); item; item = purple_xmlnode_get_next_twin(item))
 	{
 		const char *jid, *name, *subscription, *ask;
 		JabberBuddy *jb;
 
-		subscription = xmlnode_get_attrib(item, "subscription");
-		jid = xmlnode_get_attrib(item, "jid");
-		name = xmlnode_get_attrib(item, "name");
-		ask = xmlnode_get_attrib(item, "ask");
+		subscription = purple_xmlnode_get_attrib(item, "subscription");
+		jid = purple_xmlnode_get_attrib(item, "jid");
+		name = purple_xmlnode_get_attrib(item, "name");
+		ask = purple_xmlnode_get_attrib(item, "ask");
 
 		if(!jid)
 			continue;
@@ -248,8 +248,8 @@
 				if (!jabber_google_roster_incoming(js, item))
 					continue;
 
-			for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) {
-				char *group_name = xmlnode_get_data(group);
+			for(group = purple_xmlnode_get_child(item, "group"); group; group = purple_xmlnode_get_next_twin(group)) {
+				char *group_name = purple_xmlnode_get_data(group);
 
 				if (group_name == NULL || *group_name == '\0')
 					/* Changing this string?  Look in add_purple_buddy_to_groups */
@@ -274,7 +274,7 @@
 	}
 
 #if 0
-	ver = xmlnode_get_attrib(query, "ver");
+	ver = purple_xmlnode_get_attrib(query, "ver");
 	if (ver) {
 		 PurpleAccount *account = purple_connection_get_account(js->gc);
 		 purple_account_set_string(account, "roster_ver", ver);
@@ -298,7 +298,7 @@
 	PurpleGroup *g;
 	GSList *l;
 	JabberIq *iq;
-	xmlnode *query, *item, *group;
+	PurpleXmlNode *query, *item, *group;
 	const char *balias;
 
 	if (js->currently_parsing_roster_push)
@@ -334,25 +334,25 @@
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
 
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
+	query = purple_xmlnode_get_child(iq->node, "query");
+	item = purple_xmlnode_new_child(query, "item");
 
-	xmlnode_set_attrib(item, "jid", name);
+	purple_xmlnode_set_attrib(item, "jid", name);
 
 	balias = purple_buddy_get_local_alias(b);
-	xmlnode_set_attrib(item, "name", balias ? balias : "");
+	purple_xmlnode_set_attrib(item, "name", balias ? balias : "");
 
 	for(l = groups; l; l = l->next) {
-		group = xmlnode_new_child(item, "group");
-		xmlnode_insert_data(group, l->data, -1);
+		group = purple_xmlnode_new_child(item, "group");
+		purple_xmlnode_insert_data(group, l->data, -1);
 	}
 
 	g_slist_free(groups);
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
 		jabber_google_roster_outgoing(js, query, item);
-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-		xmlnode_set_attrib(query, "gr:ext", "2");
+		purple_xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+		purple_xmlnode_set_attrib(query, "gr:ext", "2");
 	}
 	jabber_iq_send(iq);
 }
@@ -500,11 +500,11 @@
 	} else {
 		JabberIq *iq = jabber_iq_new_query(purple_connection_get_protocol_data(gc), JABBER_IQ_SET,
 				"jabber:iq:roster");
-		xmlnode *query = xmlnode_get_child(iq->node, "query");
-		xmlnode *item = xmlnode_new_child(query, "item");
+		PurpleXmlNode *query = purple_xmlnode_get_child(iq->node, "query");
+		PurpleXmlNode *item = purple_xmlnode_new_child(query, "item");
 
-		xmlnode_set_attrib(item, "jid", name);
-		xmlnode_set_attrib(item, "subscription", "remove");
+		purple_xmlnode_set_attrib(item, "jid", name);
+		purple_xmlnode_set_attrib(item, "subscription", "remove");
 
 		purple_debug_info("jabber", "jabber_roster_remove_buddy(): Removing %s\n",
 		                  purple_buddy_get_name(buddy));