diff -r d50c4b767a5e -r 686fa55b0deb libpurple/protocols/jabber/jingle/rawudp.c --- a/libpurple/protocols/jabber/jingle/rawudp.c Fri Sep 06 21:31:42 2013 +0530 +++ b/libpurple/protocols/jabber/jingle/rawudp.c Sat Sep 07 00:10:19 2013 +0530 @@ -43,8 +43,8 @@ static void jingle_rawudp_finalize (GObject *object); static void jingle_rawudp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void jingle_rawudp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static JingleTransport *jingle_rawudp_parse_internal(xmlnode *rawudp); -static xmlnode *jingle_rawudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action); +static JingleTransport *jingle_rawudp_parse_internal(PurpleXmlNode *rawudp); +static PurpleXmlNode *jingle_rawudp_to_xml_internal(JingleTransport *transport, PurpleXmlNode *content, JingleActionType action); static void jingle_rawudp_add_local_candidate(JingleTransport *transport, const gchar *id, guint generation, PurpleMediaCandidate *candidate); static GList *jingle_rawudp_get_remote_candidates(JingleTransport *transport); @@ -304,19 +304,19 @@ } static JingleTransport * -jingle_rawudp_parse_internal(xmlnode *rawudp) +jingle_rawudp_parse_internal(PurpleXmlNode *rawudp) { JingleTransport *transport = parent_class->parse(rawudp); JingleRawUdpPrivate *priv = JINGLE_RAWUDP_GET_PRIVATE(transport); - xmlnode *candidate = xmlnode_get_child(rawudp, "candidate"); + PurpleXmlNode *candidate = purple_xmlnode_get_child(rawudp, "candidate"); JingleRawUdpCandidate *rawudp_candidate = NULL; - for (; candidate; candidate = xmlnode_get_next_twin(candidate)) { - const gchar *id = xmlnode_get_attrib(candidate, "id"); - const gchar *generation = xmlnode_get_attrib(candidate, "generation"); - const gchar *component = xmlnode_get_attrib(candidate, "component"); - const gchar *ip = xmlnode_get_attrib(candidate, "ip"); - const gchar *port = xmlnode_get_attrib(candidate, "port"); + for (; candidate; candidate = purple_xmlnode_get_next_twin(candidate)) { + const gchar *id = purple_xmlnode_get_attrib(candidate, "id"); + const gchar *generation = purple_xmlnode_get_attrib(candidate, "generation"); + const gchar *component = purple_xmlnode_get_attrib(candidate, "component"); + const gchar *ip = purple_xmlnode_get_attrib(candidate, "ip"); + const gchar *port = purple_xmlnode_get_attrib(candidate, "port"); if (!id || !generation || !component || !ip || !port) continue; @@ -344,10 +344,10 @@ return transport; } -static xmlnode * -jingle_rawudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action) +static PurpleXmlNode * +jingle_rawudp_to_xml_internal(JingleTransport *transport, PurpleXmlNode *content, JingleActionType action) { - xmlnode *node = parent_class->to_xml(transport, content, action); + PurpleXmlNode *node = parent_class->to_xml(transport, content, action); if (action == JINGLE_SESSION_INITIATE || action == JINGLE_TRANSPORT_INFO || @@ -357,23 +357,23 @@ for (; iter; iter = g_list_next(iter)) { JingleRawUdpCandidate *candidate = iter->data; - xmlnode *xmltransport; + PurpleXmlNode *xmltransport; gchar *generation, *component, *port; if (candidate->rem_known == TRUE) continue; candidate->rem_known = TRUE; - xmltransport = xmlnode_new_child(node, "candidate"); + xmltransport = purple_xmlnode_new_child(node, "candidate"); generation = g_strdup_printf("%d", candidate->generation); component = g_strdup_printf("%d", candidate->component); port = g_strdup_printf("%d", candidate->port); - xmlnode_set_attrib(xmltransport, "generation", generation); - xmlnode_set_attrib(xmltransport, "component", component); - xmlnode_set_attrib(xmltransport, "id", candidate->id); - xmlnode_set_attrib(xmltransport, "ip", candidate->ip); - xmlnode_set_attrib(xmltransport, "port", port); + purple_xmlnode_set_attrib(xmltransport, "generation", generation); + purple_xmlnode_set_attrib(xmltransport, "component", component); + purple_xmlnode_set_attrib(xmltransport, "id", candidate->id); + purple_xmlnode_set_attrib(xmltransport, "ip", candidate->ip); + purple_xmlnode_set_attrib(xmltransport, "port", port); g_free(port); g_free(generation);