Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jingle/session.c	Fri Sep 06 23:02:04 2013 +0530
+++ b/libpurple/protocols/jabber/jingle/session.c	Sat Sep 07 00:11:42 2013 +0530
@@ -402,29 +402,29 @@
 			find_by_jid_ghr, (gpointer)jid) : NULL;
 }
 
-static xmlnode *
+static PurpleXmlNode *
 jingle_add_jingle_packet(JingleSession *session,
 			 JabberIq *iq, JingleActionType action)
 {
-	xmlnode *jingle = iq ?
-			xmlnode_new_child(iq->node, "jingle") :
-			xmlnode_new("jingle");
+	PurpleXmlNode *jingle = iq ?
+			purple_xmlnode_new_child(iq->node, "jingle") :
+			purple_xmlnode_new("jingle");
 	gchar *local_jid = jingle_session_get_local_jid(session);
 	gchar *remote_jid = jingle_session_get_remote_jid(session);
 	gchar *sid = jingle_session_get_sid(session);
 
-	xmlnode_set_namespace(jingle, JINGLE);
-	xmlnode_set_attrib(jingle, "action", jingle_get_action_name(action));
+	purple_xmlnode_set_namespace(jingle, JINGLE);
+	purple_xmlnode_set_attrib(jingle, "action", jingle_get_action_name(action));
 
 	if (jingle_session_is_initiator(session)) {
-		xmlnode_set_attrib(jingle, "initiator", local_jid);
-		xmlnode_set_attrib(jingle, "responder", remote_jid);
+		purple_xmlnode_set_attrib(jingle, "initiator", local_jid);
+		purple_xmlnode_set_attrib(jingle, "responder", remote_jid);
 	} else {
-		xmlnode_set_attrib(jingle, "initiator", remote_jid);
-		xmlnode_set_attrib(jingle, "responder", local_jid);
+		purple_xmlnode_set_attrib(jingle, "initiator", remote_jid);
+		purple_xmlnode_set_attrib(jingle, "responder", local_jid);
 	}
 
-	xmlnode_set_attrib(jingle, "sid", sid);
+	purple_xmlnode_set_attrib(jingle, "sid", sid);
 
 	g_free(local_jid);
 	g_free(remote_jid);
@@ -434,15 +434,15 @@
 }
 
 JabberIq *
-jingle_session_create_ack(JingleSession *session, const xmlnode *jingle)
+jingle_session_create_ack(JingleSession *session, const PurpleXmlNode *jingle)
 {
 	JabberIq *result = jabber_iq_new(
 			jingle_session_get_js(session),
 			JABBER_IQ_RESULT);
-	xmlnode *packet = xmlnode_get_parent(jingle);
-	jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
-	xmlnode_set_attrib(result->node, "from", xmlnode_get_attrib(packet, "to"));
-	xmlnode_set_attrib(result->node, "to", xmlnode_get_attrib(packet, "from"));
+	PurpleXmlNode *packet = purple_xmlnode_get_parent(jingle);
+	jabber_iq_set_id(result, purple_xmlnode_get_attrib(packet, "id"));
+	purple_xmlnode_set_attrib(result->node, "from", purple_xmlnode_get_attrib(packet, "to"));
+	purple_xmlnode_set_attrib(result->node, "to", purple_xmlnode_get_attrib(packet, "from"));
 	return result;
 }
 
@@ -454,16 +454,16 @@
 	gchar *from = jingle_session_get_local_jid(session);
 	gchar *to = jingle_session_get_remote_jid(session);
 
-	xmlnode_set_attrib(result->node, "from", from);
-	xmlnode_set_attrib(result->node, "to", to);
+	purple_xmlnode_set_attrib(result->node, "from", from);
+	purple_xmlnode_set_attrib(result->node, "to", to);
 
 	g_free(from);
 	g_free(to);
 	return result;
 }
 
-xmlnode *
-jingle_session_to_xml(JingleSession *session, xmlnode *jingle, JingleActionType action)
+PurpleXmlNode *
+jingle_session_to_xml(JingleSession *session, PurpleXmlNode *jingle, JingleActionType action)
 {
 	if (action != JINGLE_SESSION_INFO && action != JINGLE_SESSION_TERMINATE) {
 		GList *iter;
@@ -485,12 +485,12 @@
 jingle_session_to_packet(JingleSession *session, JingleActionType action)
 {
 	JabberIq *iq = jingle_create_iq(session);
-	xmlnode *jingle = jingle_add_jingle_packet(session, iq, action);
+	PurpleXmlNode *jingle = jingle_add_jingle_packet(session, iq, action);
 	jingle_session_to_xml(session, jingle, action);
 	return iq;
 }
 
-void jingle_session_handle_action(JingleSession *session, xmlnode *jingle, JingleActionType action)
+void jingle_session_handle_action(JingleSession *session, PurpleXmlNode *jingle, JingleActionType action)
 {
 	GList *iter;
 	if (action == JINGLE_CONTENT_ADD || action == JINGLE_CONTENT_REMOVE)
@@ -621,12 +621,12 @@
 {
 	JabberIq *iq = jingle_session_to_packet(session,
 			JINGLE_SESSION_TERMINATE);
-	xmlnode *jingle = xmlnode_get_child(iq->node, "jingle");
+	PurpleXmlNode *jingle = purple_xmlnode_get_child(iq->node, "jingle");
 
 	if (reason != NULL) {
-		xmlnode *reason_node;
-		reason_node = xmlnode_new_child(jingle, "reason");
-		xmlnode_new_child(reason_node, reason);
+		PurpleXmlNode *reason_node;
+		reason_node = purple_xmlnode_new_child(jingle, "reason");
+		purple_xmlnode_new_child(reason_node, reason);
 	}
 	return iq;
 }
@@ -636,17 +636,17 @@
 {
 	JabberIq *iq = jingle_session_terminate_packet(session,
 			"alternative-session");
-	xmlnode *alt_session;
+	PurpleXmlNode *alt_session;
 
 	if (sid == NULL)
 		return iq;
 
-	alt_session = xmlnode_get_child(iq->node,
+	alt_session = purple_xmlnode_get_child(iq->node,
 			"jingle/reason/alternative-session");
 
 	if (alt_session != NULL) {
-		xmlnode *sid_node = xmlnode_new_child(alt_session, "sid");
-		xmlnode_insert_data(sid_node, sid, -1);
+		PurpleXmlNode *sid_node = purple_xmlnode_new_child(alt_session, "sid");
+		purple_xmlnode_insert_data(sid_node, sid, -1);
 	}
 	return iq;
 }