Updated for libxml2. Likewise. Likewise. Likewise.

* e-component-info.c: Updated for libxml2.
* e-shortcuts.c: Likewise.
* e-folder-list.c: Likewise.
* e-local-folder.c: Likewise.

svn path=/trunk/; revision=18512

5 files changed, 22 insertions, 15 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index b7ce8773a4..e2e7cfda98 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,12 @@
 2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
 
+	* e-component-info.c: Updated for libxml2.
+	* e-shortcuts.c: Likewise.
+	* e-folder-list.c: Likewise.
+	* e-local-folder.c: Likewise.
+
+2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
+
 	* GNOME_Evolution_Shell.server.in: Renamed from
 	GNOME_Evolution_Shell.oaf.in.
 
diff --git a/shell/e-component-info.c b/shell/e-component-info.c
index 19d999a868..8cb93d5c09 100644
--- a/shell/e-component-info.c
+++ b/shell/e-component-info.c
@@ -28,8 +28,8 @@
 
 #include "e-util/e-lang-utils.h"
 
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -54,7 +54,7 @@ lookup_node (xmlNode *parent_node,
 {
 	xmlNode *p;
 
-	for (p = parent_node->childs; p != NULL; p = p->next) {
+	for (p = parent_node->children; p != NULL; p = p->next) {
 		if (strcmp ((const char *) p->name, node_name) == 0)
 			return p;
 	}
@@ -82,7 +82,7 @@ lookup_node_for_language (xmlNode *parent_node,
 {
 	xmlNode *p;
 
-	for (p = parent_node->childs; p != NULL; p = p->next) {
+	for (p = parent_node->children; p != NULL; p = p->next) {
 		xmlChar *node_language_id;
 
 		if (strcmp ((const char *) p->name, node_name) != 0)
@@ -226,7 +226,7 @@ e_component_info_load (const char *file_name)
 	new->uri_schemas               = NULL;
 	new->user_creatable_item_types = NULL;
 
-	for (p = root->childs; p != NULL; p = p->next) {
+	for (p = root->children; p != NULL; p = p->next) {
 		if (strcmp ((char *) p->name, "folder_type") == 0) 
 			add_folder_type (new, p, language_list);
 		else if (strcmp ((char *) p->name, "user_creatable_item_type") == 0)
diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c
index 7291d7fde6..24e00fa907 100644
--- a/shell/e-folder-list.c
+++ b/shell/e-folder-list.c
@@ -29,8 +29,8 @@
 
 #include <libgnome/gnome-i18n.h>
 
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include <glade/glade.h>
 
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
index 3da916f5fb..3f58e09a3d 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.c
@@ -45,8 +45,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include <libgnome/gnome-util.h>
 
@@ -255,7 +255,7 @@ retrieve_info (ELocalFolder *local_folder,
 
 	priv = local_folder->priv;
 
-	for (p = root_xml_node->childs; p != NULL; p = p->next) {
+	for (p = root_xml_node->children; p != NULL; p = p->next) {
 		if (xmlStrcmp (p->name, "info") == 0)
 			retrieve_info_item (local_folder, p);
 	}
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 262ed0f97e..ee07e3ebd8 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -52,8 +52,8 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtktypeutils.h>
 
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include <libgnome/gnome-i18n.h>
 
@@ -305,7 +305,7 @@ load_shortcuts (EShortcuts *shortcuts,
 
 	unload_shortcuts (shortcuts);
 
-	for (p = root->childs; p != NULL; p = p->next) {
+	for (p = root->children; p != NULL; p = p->next) {
 		ShortcutGroup *shortcut_group;
 		xmlChar *shortcut_group_title;
 		xmlChar *icon_size;
@@ -327,7 +327,7 @@ load_shortcuts (EShortcuts *shortcuts,
 			shortcut_group->use_small_icons = FALSE;
 		xmlFree (icon_size);
 
-		for (q = p->childs; q != NULL; q = q->next) {
+		for (q = p->children; q != NULL; q = q->next) {
 			EShortcutItem *shortcut_item;
 			xmlChar *uri;
 			xmlChar *name;
@@ -338,7 +338,7 @@ load_shortcuts (EShortcuts *shortcuts,
 			if (strcmp ((char *) q->name, "item") != 0)
 				continue;
 
-			uri  = xmlNodeListGetString (doc, q->childs, 1);
+			uri  = xmlNodeListGetString (doc, q->children, 1);
 			if (uri == NULL)
 				continue;