Mercurial > pidgin.yaz

--- a/src/Makefile.am	Fri Oct 03 15:23:01 2003 +0000
+++ b/src/Makefile.am	Fri Oct 03 21:10:12 2003 +0000
@@ -100,7 +100,9 @@
 	util.c \
 	util.h \
 	value.c \
-	value.h
+	value.h \
+	xmlnode.c \
+	xmlnode.h

 bin_PROGRAMS = gaim gaim-remote
 gaim_SOURCES = \
--- a/src/protocols/jabber/Makefile.am	Fri Oct 03 15:23:01 2003 +0000
+++ b/src/protocols/jabber/Makefile.am	Fri Oct 03 21:10:12 2003 +0000
@@ -22,9 +22,7 @@
 			  presence.c \
 			  presence.h \
 			  roster.c \
-			  roster.h \
-			  xmlnode.c \
-			  xmlnode.h
+			  roster.h

 AM_CFLAGS = $(st)
--- a/src/protocols/jabber/xmlnode.c	Fri Oct 03 15:23:01 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,377 +0,0 @@
-/**
- * @file xmlnode.c XML DOM functions
- *
- * gaim
- *
- * Copyright (C) 2003 Nathan Walp <faceprint@faceprint.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* A lot of this code at least resembles the code in libxode, but since
- * libxode uses memory pools that we simply have no need for, I decided to
- * write my own stuff.  Also, re-writing this lets me be as lightweight
- * as I want to be.  Thank you libxode for giving me a good starting point */
-
-#include "internal.h"
-
-#include <string.h>
-#include <glib.h>
-
-#include "xmlnode.h"
-
-static xmlnode*
-new_node(const char *name, NodeType type)
-{
-	xmlnode *node = g_new0(xmlnode, 1);
-	if(name)
-		node->name = g_strdup(name);
-	node->type = type;
-
-	return node;
-}
-
-xmlnode*
-xmlnode_new(const char *name)
-{
-	g_return_val_if_fail(name != NULL, NULL);
-
-	return new_node(name, NODE_TYPE_TAG);
-}
-
-xmlnode *xmlnode_new_child(xmlnode *parent, const char *name)
-{
-	xmlnode *node;
-
-	g_return_val_if_fail(parent != NULL, NULL);
-	g_return_val_if_fail(name != NULL, NULL);
-
-	node = new_node(name, NODE_TYPE_TAG);
-
-	xmlnode_insert_child(parent, node);
-
-	return node;
-}
-
-void
-xmlnode_insert_child(xmlnode *parent, xmlnode *child)
-{
-	g_return_if_fail(parent != NULL);
-	g_return_if_fail(child != NULL);
-
-	child->parent = parent;
-
-	if(parent->child) {
-		xmlnode *x;
-		for(x = parent->child; x->next; x = x->next);
-		x->next = child;
-	} else {
-		parent->child = child;
-	}
-}
-
-void
-xmlnode_insert_data(xmlnode *parent, const char *data, size_t size)
-{
-	xmlnode *node;
-	size_t real_size;
-
-	g_return_if_fail(parent != NULL);
-	g_return_if_fail(data != NULL);
-	g_return_if_fail(size != 0);
-
-	real_size = size == -1 ? strlen(data) : size;
-
-	node = new_node(NULL, NODE_TYPE_DATA);
-
-	node->data = g_memdup(data, real_size);
-	node->data_sz = real_size;
-
-	xmlnode_insert_child(parent, node);
-}
-
-void
-xmlnode_remove_attrib(xmlnode *node, const char *attr)
-{
-	xmlnode *attr_node, *sibling = NULL;
-
-	g_return_if_fail(node != NULL);
-	g_return_if_fail(attr != NULL);
-
-	for(attr_node = node->child; attr_node; attr_node = attr_node->next)
-	{
-		if(attr_node->type == NODE_TYPE_ATTRIB &&
-				!strcmp(attr_node->name, attr)) {
-			if(node->child == attr_node) {
-				node->child = attr_node->next;
-			} else {
-				sibling->next = attr_node->next;
-			}
-			xmlnode_free(attr_node);
-			return;
-		}
-		sibling = attr_node;
-	}
-}
-
-void
-xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value)
-{
-	xmlnode *attrib_node;
-
-	g_return_if_fail(node != NULL);
-	g_return_if_fail(attr != NULL);
-	g_return_if_fail(value != NULL);
-
-	xmlnode_remove_attrib(node, attr);
-
-	attrib_node = new_node(attr, NODE_TYPE_ATTRIB);
-
-	attrib_node->data = g_strdup(value);
-
-	xmlnode_insert_child(node, attrib_node);
-}
-
-const char*
-xmlnode_get_attrib(xmlnode *node, const char *attr)
-{
-	xmlnode *x;
-
-	g_return_val_if_fail(node != NULL, NULL);
-
-	for(x = node->child; x; x = x->next) {
-		if(x->type == NODE_TYPE_ATTRIB && !strcmp(attr, x->name)) {
-			return x->data;
-		}
-	}
-
-	return NULL;
-}
-
-void xmlnode_free(xmlnode *node)
-{
-	xmlnode *x, *y;
-
-	g_return_if_fail(node != NULL);
-
-	x = node->child;
-	while(x) {
-		y = x->next;
-		xmlnode_free(x);
-		x = y;
-	}
-
-	if(node->name)
-		g_free(node->name);
-	if(node->data)
-		g_free(node->data);
-	g_free(node);
-}
-
-xmlnode*
-xmlnode_get_child(xmlnode *parent, const char *name)
-{
-	xmlnode *x, *ret = NULL;
-	char **names;
-	char *parent_name, *child_name;
-
-	g_return_val_if_fail(parent != NULL, NULL);
-
-	names = g_strsplit(name, "/", 2);
-	parent_name = names[0];
-	child_name = names[1];
-
-	for(x = parent->child; x; x = x->next) {
-		if(x->type == NODE_TYPE_TAG && name && !strcmp(parent_name, x->name)) {
-			ret = x;
-			break;
-		}
-	}
-
-	if(child_name && ret)
-		ret = xmlnode_get_child(x, child_name);
-
-	g_strfreev(names);
-	return ret;
-}
-
-char *
-xmlnode_get_data(xmlnode *node)
-{
-	GString *str = NULL;
-	char *ret = NULL;
-	xmlnode *c;
-
-	g_return_val_if_fail(node != NULL, NULL);
-
-
-	for(c = node->child; c; c = c->next) {
-		if(c->type == NODE_TYPE_DATA) {
-			if(!str)
-				str = g_string_new("");
-			str = g_string_append_len(str, c->data, c->data_sz);
-		}
-	}
-
-	if(str) {
-		ret = str->str;
-		g_string_free(str, FALSE);
-	}
-
-	return ret;
-}
-
-char *xmlnode_to_str(xmlnode *node)
-{
-	char *ret;
-	GString *text = g_string_new("");
-	xmlnode *c;
-	char *node_name, *esc, *esc2;
-	gboolean need_end = FALSE;
-
-	node_name = g_markup_escape_text(node->name, -1);
-	g_string_append_printf(text, "<%s", node_name);
-
-
-	for(c = node->child; c; c = c->next)
-	{
-		if(c->type == NODE_TYPE_ATTRIB) {
-			esc = g_markup_escape_text(c->name, -1);
-			esc2 = g_markup_escape_text(c->data, -1);
-			g_string_append_printf(text, " %s='%s'", esc, esc2);
-			g_free(esc);
-			g_free(esc2);
-		} else if(c->type == NODE_TYPE_TAG || c->type == NODE_TYPE_DATA) {
-			need_end = TRUE;
-		}
-	}
-
-	if(need_end) {
-		text = g_string_append_c(text, '>');
-
-		for(c = node->child; c; c = c->next)
-		{
-			if(c->type == NODE_TYPE_TAG) {
-				esc = xmlnode_to_str(c);
-				g_string_append_printf(text, "%s", esc);
-				g_free(esc);
-			} else if(c->type == NODE_TYPE_DATA) {
-				esc = g_markup_escape_text(c->data, c->data_sz);
-				g_string_append_printf(text, "%s", esc);
-				g_free(esc);
-			}
-		}
-
-		g_string_append_printf(text, "</%s>", node_name);
-	} else {
-		g_string_append_printf(text, "/>");
-	}
-
-	g_free(node_name);
-
-	ret = text->str;
-	g_string_free(text, FALSE);
-	return ret;
-}
-
-struct _xmlnode_parser_data {
-	xmlnode *current;
-};
-
-static void
-xmlnode_parser_element_start(GMarkupParseContext *context,
-		const char *element_name, const char **attrib_names,
-		const char **attrib_values, gpointer user_data, GError **error)
-{
-	struct _xmlnode_parser_data *xpd = user_data;
-	xmlnode *node;
-	int i;
-
-	if(!element_name) {
-		return;
-	} else {
-		if(xpd->current)
-			node = xmlnode_new_child(xpd->current, element_name);
-		else
-			node = xmlnode_new(element_name);
-
-		for(i=0; attrib_names[i]; i++)
-			xmlnode_set_attrib(node, attrib_names[i], attrib_values[i]);
-
-		xpd->current = node;
-	}
-}
-
-static void
-xmlnode_parser_element_end(GMarkupParseContext *context,
-		const char *element_name, gpointer user_data, GError **error)
-{
-	struct _xmlnode_parser_data *xpd = user_data;
-
-	if(!element_name || !xpd->current)
-		return;
-
-	if(xpd->current->parent) {
-		if(!strcmp(xpd->current->name, element_name))
-			xpd->current = xpd->current->parent;
-	}
-}
-
-static void
-xmlnode_parser_element_text(GMarkupParseContext *context, const char *text,
-		gsize text_len, gpointer user_data, GError **error)
-{
-	struct _xmlnode_parser_data *xpd = user_data;
-
-	if(!xpd->current)
-		return;
-
-	if(!text || !text_len)
-		return;
-
-	xmlnode_insert_data(xpd->current, text, text_len);
-}
-
-static GMarkupParser xmlnode_parser = {
-	xmlnode_parser_element_start,
-	xmlnode_parser_element_end,
-	xmlnode_parser_element_text,
-	NULL,
-	NULL
-};
-
-
-xmlnode *xmlnode_from_str(const char *str, size_t size)
-{
-	struct _xmlnode_parser_data *xpd = g_new0(struct _xmlnode_parser_data, 1);
-	xmlnode *ret;
-	GMarkupParseContext *context;
-	size_t real_size = size == -1 ? strlen(str) : size;
-
-	context = g_markup_parse_context_new(&xmlnode_parser, 0, xpd, NULL);
-
-	if(!g_markup_parse_context_parse(context, str, real_size, NULL)) {
-		while(xpd->current && xpd->current->parent)
-			xpd->current = xpd->current->parent;
-		if(xpd->current)
-			xmlnode_free(xpd->current);
-		xpd->current = NULL;
-	}
-	g_markup_parse_context_free(context);
-
-	ret = xpd->current;
-	g_free(xpd);
-	return ret;
-}
--- a/src/protocols/jabber/xmlnode.h	Fri Oct 03 15:23:01 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
- * @file xmlnode.h XML DOM functions
- *
- * gaim
- *
- * Copyright (C) 2003 Nathan Walp <faceprint@faceprint.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef _GAIM_XMLNODE_H_
-#define _GAIM_XMLNODE_H_
-
-typedef enum _NodeType
-{
-	NODE_TYPE_TAG,
-	NODE_TYPE_ATTRIB,
-	NODE_TYPE_DATA
-} NodeType;
-
-typedef struct _xmlnode
-{
-	char *name;
-	NodeType type;
-	char *data;
-	size_t data_sz;
-	struct _xmlnode *parent;
-	struct _xmlnode *child;
-	struct _xmlnode *next;
-} xmlnode;
-
-xmlnode *xmlnode_new(const char *name);
-xmlnode *xmlnode_new_child(xmlnode *parent, const char *name);
-void xmlnode_insert_child(xmlnode *parent, xmlnode *child);
-xmlnode *xmlnode_get_child(xmlnode *parent, const char *name);
-void xmlnode_insert_data(xmlnode *parent, const char *data, size_t size);
-char *xmlnode_get_data(xmlnode *node);
-void xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value);
-const char *xmlnode_get_attrib(xmlnode *node, const char *attr);
-void xmlnode_remove_attrib(xmlnode *node, const char *attr);
-char *xmlnode_to_str(xmlnode *node);
-xmlnode *xmlnode_from_str(const char *str, size_t size);
-
-void xmlnode_free(xmlnode *node);
-
-#endif /* _GAIM_XMLNODE_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xmlnode.c	Fri Oct 03 21:10:12 2003 +0000
@@ -0,0 +1,377 @@
+/**
+ * @file xmlnode.c XML DOM functions
+ *
+ * gaim
+ *
+ * Copyright (C) 2003 Nathan Walp <faceprint@faceprint.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* A lot of this code at least resembles the code in libxode, but since
+ * libxode uses memory pools that we simply have no need for, I decided to
+ * write my own stuff.  Also, re-writing this lets me be as lightweight
+ * as I want to be.  Thank you libxode for giving me a good starting point */
+
+#include "internal.h"
+
+#include <string.h>
+#include <glib.h>
+
+#include "xmlnode.h"
+
+static xmlnode*
+new_node(const char *name, NodeType type)
+{
+	xmlnode *node = g_new0(xmlnode, 1);
+	if(name)
+		node->name = g_strdup(name);
+	node->type = type;
+
+	return node;
+}
+
+xmlnode*
+xmlnode_new(const char *name)
+{
+	g_return_val_if_fail(name != NULL, NULL);
+
+	return new_node(name, NODE_TYPE_TAG);
+}
+
+xmlnode *xmlnode_new_child(xmlnode *parent, const char *name)
+{
+	xmlnode *node;
+
+	g_return_val_if_fail(parent != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
+	node = new_node(name, NODE_TYPE_TAG);
+
+	xmlnode_insert_child(parent, node);
+
+	return node;
+}
+
+void
+xmlnode_insert_child(xmlnode *parent, xmlnode *child)
+{
+	g_return_if_fail(parent != NULL);
+	g_return_if_fail(child != NULL);
+
+	child->parent = parent;
+
+	if(parent->child) {
+		xmlnode *x;
+		for(x = parent->child; x->next; x = x->next);
+		x->next = child;
+	} else {
+		parent->child = child;
+	}
+}
+
+void
+xmlnode_insert_data(xmlnode *parent, const char *data, size_t size)
+{
+	xmlnode *node;
+	size_t real_size;
+
+	g_return_if_fail(parent != NULL);
+	g_return_if_fail(data != NULL);
+	g_return_if_fail(size != 0);
+
+	real_size = size == -1 ? strlen(data) : size;
+
+	node = new_node(NULL, NODE_TYPE_DATA);
+
+	node->data = g_memdup(data, real_size);
+	node->data_sz = real_size;
+
+	xmlnode_insert_child(parent, node);
+}
+
+void
+xmlnode_remove_attrib(xmlnode *node, const char *attr)
+{
+	xmlnode *attr_node, *sibling = NULL;
+
+	g_return_if_fail(node != NULL);
+	g_return_if_fail(attr != NULL);
+
+	for(attr_node = node->child; attr_node; attr_node = attr_node->next)
+	{
+		if(attr_node->type == NODE_TYPE_ATTRIB &&
+				!strcmp(attr_node->name, attr)) {
+			if(node->child == attr_node) {
+				node->child = attr_node->next;
+			} else {
+				sibling->next = attr_node->next;
+			}
+			xmlnode_free(attr_node);
+			return;
+		}
+		sibling = attr_node;
+	}
+}
+
+void
+xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value)
+{
+	xmlnode *attrib_node;
+
+	g_return_if_fail(node != NULL);
+	g_return_if_fail(attr != NULL);
+	g_return_if_fail(value != NULL);
+
+	xmlnode_remove_attrib(node, attr);
+
+	attrib_node = new_node(attr, NODE_TYPE_ATTRIB);
+
+	attrib_node->data = g_strdup(value);
+
+	xmlnode_insert_child(node, attrib_node);
+}
+
+const char*
+xmlnode_get_attrib(xmlnode *node, const char *attr)
+{
+	xmlnode *x;
+
+	g_return_val_if_fail(node != NULL, NULL);
+
+	for(x = node->child; x; x = x->next) {
+		if(x->type == NODE_TYPE_ATTRIB && !strcmp(attr, x->name)) {
+			return x->data;
+		}
+	}
+
+	return NULL;
+}
+
+void xmlnode_free(xmlnode *node)
+{
+	xmlnode *x, *y;
+
+	g_return_if_fail(node != NULL);
+
+	x = node->child;
+	while(x) {
+		y = x->next;
+		xmlnode_free(x);
+		x = y;
+	}
+
+	if(node->name)
+		g_free(node->name);
+	if(node->data)
+		g_free(node->data);
+	g_free(node);
+}
+
+xmlnode*
+xmlnode_get_child(xmlnode *parent, const char *name)
+{
+	xmlnode *x, *ret = NULL;
+	char **names;
+	char *parent_name, *child_name;
+
+	g_return_val_if_fail(parent != NULL, NULL);
+
+	names = g_strsplit(name, "/", 2);
+	parent_name = names[0];
+	child_name = names[1];
+
+	for(x = parent->child; x; x = x->next) {
+		if(x->type == NODE_TYPE_TAG && name && !strcmp(parent_name, x->name)) {
+			ret = x;
+			break;
+		}
+	}
+
+	if(child_name && ret)
+		ret = xmlnode_get_child(x, child_name);
+
+	g_strfreev(names);
+	return ret;
+}
+
+char *
+xmlnode_get_data(xmlnode *node)
+{
+	GString *str = NULL;
+	char *ret = NULL;
+	xmlnode *c;
+
+	g_return_val_if_fail(node != NULL, NULL);
+
+
+	for(c = node->child; c; c = c->next) {
+		if(c->type == NODE_TYPE_DATA) {
+			if(!str)
+				str = g_string_new("");
+			str = g_string_append_len(str, c->data, c->data_sz);
+		}
+	}
+
+	if(str) {
+		ret = str->str;
+		g_string_free(str, FALSE);
+	}
+
+	return ret;
+}
+
+char *xmlnode_to_str(xmlnode *node)
+{
+	char *ret;
+	GString *text = g_string_new("");
+	xmlnode *c;
+	char *node_name, *esc, *esc2;
+	gboolean need_end = FALSE;
+
+	node_name = g_markup_escape_text(node->name, -1);
+	g_string_append_printf(text, "<%s", node_name);
+
+
+	for(c = node->child; c; c = c->next)
+	{
+		if(c->type == NODE_TYPE_ATTRIB) {
+			esc = g_markup_escape_text(c->name, -1);
+			esc2 = g_markup_escape_text(c->data, -1);
+			g_string_append_printf(text, " %s='%s'", esc, esc2);
+			g_free(esc);
+			g_free(esc2);
+		} else if(c->type == NODE_TYPE_TAG || c->type == NODE_TYPE_DATA) {
+			need_end = TRUE;
+		}
+	}
+
+	if(need_end) {
+		text = g_string_append_c(text, '>');
+
+		for(c = node->child; c; c = c->next)
+		{
+			if(c->type == NODE_TYPE_TAG) {
+				esc = xmlnode_to_str(c);
+				g_string_append_printf(text, "%s", esc);
+				g_free(esc);
+			} else if(c->type == NODE_TYPE_DATA) {
+				esc = g_markup_escape_text(c->data, c->data_sz);
+				g_string_append_printf(text, "%s", esc);
+				g_free(esc);
+			}
+		}
+
+		g_string_append_printf(text, "</%s>", node_name);
+	} else {
+		g_string_append_printf(text, "/>");
+	}
+
+	g_free(node_name);
+
+	ret = text->str;
+	g_string_free(text, FALSE);
+	return ret;
+}
+
+struct _xmlnode_parser_data {
+	xmlnode *current;
+};
+
+static void
+xmlnode_parser_element_start(GMarkupParseContext *context,
+		const char *element_name, const char **attrib_names,
+		const char **attrib_values, gpointer user_data, GError **error)
+{
+	struct _xmlnode_parser_data *xpd = user_data;
+	xmlnode *node;
+	int i;
+
+	if(!element_name) {
+		return;
+	} else {
+		if(xpd->current)
+			node = xmlnode_new_child(xpd->current, element_name);
+		else
+			node = xmlnode_new(element_name);
+
+		for(i=0; attrib_names[i]; i++)
+			xmlnode_set_attrib(node, attrib_names[i], attrib_values[i]);
+
+		xpd->current = node;
+	}
+}
+
+static void
+xmlnode_parser_element_end(GMarkupParseContext *context,
+		const char *element_name, gpointer user_data, GError **error)
+{
+	struct _xmlnode_parser_data *xpd = user_data;
+
+	if(!element_name || !xpd->current)
+		return;
+
+	if(xpd->current->parent) {
+		if(!strcmp(xpd->current->name, element_name))
+			xpd->current = xpd->current->parent;
+	}
+}
+
+static void
+xmlnode_parser_element_text(GMarkupParseContext *context, const char *text,
+		gsize text_len, gpointer user_data, GError **error)
+{
+	struct _xmlnode_parser_data *xpd = user_data;
+
+	if(!xpd->current)
+		return;
+
+	if(!text || !text_len)
+		return;
+
+	xmlnode_insert_data(xpd->current, text, text_len);
+}
+
+static GMarkupParser xmlnode_parser = {
+	xmlnode_parser_element_start,
+	xmlnode_parser_element_end,
+	xmlnode_parser_element_text,
+	NULL,
+	NULL
+};
+
+
+xmlnode *xmlnode_from_str(const char *str, size_t size)
+{
+	struct _xmlnode_parser_data *xpd = g_new0(struct _xmlnode_parser_data, 1);
+	xmlnode *ret;
+	GMarkupParseContext *context;
+	size_t real_size = size == -1 ? strlen(str) : size;
+
+	context = g_markup_parse_context_new(&xmlnode_parser, 0, xpd, NULL);
+
+	if(!g_markup_parse_context_parse(context, str, real_size, NULL)) {
+		while(xpd->current && xpd->current->parent)
+			xpd->current = xpd->current->parent;
+		if(xpd->current)
+			xmlnode_free(xpd->current);
+		xpd->current = NULL;
+	}
+	g_markup_parse_context_free(context);
+
+	ret = xpd->current;
+	g_free(xpd);
+	return ret;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xmlnode.h	Fri Oct 03 21:10:12 2003 +0000
@@ -0,0 +1,57 @@
+/**
+ * @file xmlnode.h XML DOM functions
+ *
+ * gaim
+ *
+ * Copyright (C) 2003 Nathan Walp <faceprint@faceprint.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _GAIM_XMLNODE_H_
+#define _GAIM_XMLNODE_H_
+
+typedef enum _NodeType
+{
+	NODE_TYPE_TAG,
+	NODE_TYPE_ATTRIB,
+	NODE_TYPE_DATA
+} NodeType;
+
+typedef struct _xmlnode
+{
+	char *name;
+	NodeType type;
+	char *data;
+	size_t data_sz;
+	struct _xmlnode *parent;
+	struct _xmlnode *child;
+	struct _xmlnode *next;
+} xmlnode;
+
+xmlnode *xmlnode_new(const char *name);
+xmlnode *xmlnode_new_child(xmlnode *parent, const char *name);
+void xmlnode_insert_child(xmlnode *parent, xmlnode *child);
+xmlnode *xmlnode_get_child(xmlnode *parent, const char *name);
+void xmlnode_insert_data(xmlnode *parent, const char *data, size_t size);
+char *xmlnode_get_data(xmlnode *node);
+void xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value);
+const char *xmlnode_get_attrib(xmlnode *node, const char *attr);
+void xmlnode_remove_attrib(xmlnode *node, const char *attr);
+char *xmlnode_to_str(xmlnode *node);
+xmlnode *xmlnode_from_str(const char *str, size_t size);
+
+void xmlnode_free(xmlnode *node);
+
+#endif /* _GAIM_XMLNODE_H_ */