callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated for libxml2. Likewise. Likewise. Likewise.

Browse Source 
* 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
This commit is contained in:
Ettore Perazzoli
2002-11-03 19:36:39 +00:00
parent a53b427829
commit 9cbba714fc
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ChangeLog
View File

@ -1,3 +1,10 @@
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> 2002-11-03 Ettore Perazzoli <ettore@ximian.com>
* GNOME_Evolution_Shell.server.in: Renamed from * GNOME_Evolution_Shell.server.in: Renamed from

10
shell/e-component-info.c
View File

@ -28,8 +28,8 @@
#include "e-util/e-lang-utils.h" #include "e-util/e-lang-utils.h"
#include <gnome-xml/parser.h> #include <libxml/parser.h>
#include <gnome-xml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -54,7 +54,7 @@ lookup_node (xmlNode *parent_node,
{ {
xmlNode *p; 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) if (strcmp ((const char *) p->name, node_name) == 0)
return p; return p;
} }
@ -82,7 +82,7 @@ lookup_node_for_language (xmlNode *parent_node,
{ {
xmlNode *p; 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; xmlChar *node_language_id;
if (strcmp ((const char *) p->name, node_name) != 0) 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->uri_schemas = NULL;
new->user_creatable_item_types = 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) if (strcmp ((char *) p->name, "folder_type") == 0)
add_folder_type (new, p, language_list); add_folder_type (new, p, language_list);
else if (strcmp ((char *) p->name, "user_creatable_item_type") == 0) else if (strcmp ((char *) p->name, "user_creatable_item_type") == 0)

4
shell/e-folder-list.c
View File

@ -29,8 +29,8 @@
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
#include <gnome-xml/parser.h> #include <libxml/parser.h>
#include <gnome-xml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <glade/glade.h> #include <glade/glade.h>

6
shell/e-local-folder.c
View File

@ -45,8 +45,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <gnome-xml/parser.h> #include <libxml/parser.h>
#include <gnome-xml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <libgnome/gnome-util.h> #include <libgnome/gnome-util.h>
@ -255,7 +255,7 @@ retrieve_info (ELocalFolder *local_folder,
priv = local_folder->priv; 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) if (xmlStrcmp (p->name, "info") == 0)
retrieve_info_item (local_folder, p); retrieve_info_item (local_folder, p);
} }

10
shell/e-shortcuts.c
View File

@ -52,8 +52,8 @@
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
#include <gtk/gtktypeutils.h> #include <gtk/gtktypeutils.h>
#include <gnome-xml/parser.h> #include <libxml/parser.h>
#include <gnome-xml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
@ -305,7 +305,7 @@ load_shortcuts (EShortcuts *shortcuts,
unload_shortcuts (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; ShortcutGroup *shortcut_group;
xmlChar *shortcut_group_title; xmlChar *shortcut_group_title;
xmlChar *icon_size; xmlChar *icon_size;
@ -327,7 +327,7 @@ load_shortcuts (EShortcuts *shortcuts,
shortcut_group->use_small_icons = FALSE; shortcut_group->use_small_icons = FALSE;
xmlFree (icon_size); xmlFree (icon_size);
for (q = p->childs; q != NULL; q = q->next) { for (q = p->children; q != NULL; q = q->next) {
EShortcutItem *shortcut_item; EShortcutItem *shortcut_item;
xmlChar *uri; xmlChar *uri;
xmlChar *name; xmlChar *name;
@ -338,7 +338,7 @@ load_shortcuts (EShortcuts *shortcuts,
if (strcmp ((char *) q->name, "item") != 0) if (strcmp ((char *) q->name, "item") != 0)
continue; continue;
uri = xmlNodeListGetString (doc, q->childs, 1); uri = xmlNodeListGetString (doc, q->children, 1);
if (uri == NULL) if (uri == NULL)
continue; continue;