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

Convert to use libxml2.

Browse Source 
svn path=/trunk/; revision=18709
This commit is contained in:
Ettore Perazzoli
2002-11-11 20:30:10 +00:00
parent bffbf68143
commit ff0a388714
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
my-evolution/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-11 Ettore Perazzoli <ettore@ximian.com>
* e-summary-rdf.c: Convert to use libxml2.
2002-11-11 Ettore Perazzoli <ettore@ximian.com> 2002-11-11 Ettore Perazzoli <ettore@ximian.com>
* e-summary-offline-handler.c: Convert from GtkObject to GObject. * e-summary-offline-handler.c: Convert from GtkObject to GObject.

24
my-evolution/e-summary-rdf.c
View File

@ -28,8 +28,8 @@
#include <glib.h> #include <glib.h>
#include <gtk/gtkmain.h> #include <gtk/gtkmain.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>
@ -103,8 +103,8 @@ layer_find (xmlNodePtr node,
printf("%s.\n", node->name); printf("%s.\n", node->name);
#endif #endif
if (strcasecmp (node->name, match)==0) { if (strcasecmp (node->name, match)==0) {
if (node->childs != NULL && node->childs->content != NULL) { if (node->children != NULL && node->children->content != NULL) {
return node->childs->content; return node->children->content;
} else { } else {
return fail; return fail;
} }
@ -213,12 +213,12 @@ tree_walk (xmlNodePtr root,
printf ("%p, %s\n", walk, walk->name); printf ("%p, %s\n", walk, walk->name);
#endif #endif
if (strcasecmp (walk->name, "rdf") == 0) { if (strcasecmp (walk->name, "rdf") == 0) {
rewalk = walk->childs; rewalk = walk->children;
walk = walk->next; walk = walk->next;
continue; continue;
} }
if (strcasecmp (walk->name, "rss") == 0){ if (strcasecmp (walk->name, "rss") == 0){
rewalk = walk->childs; rewalk = walk->children;
walk = walk->next; walk = walk->next;
continue; continue;
} }
@ -228,7 +228,7 @@ tree_walk (xmlNodePtr root,
#endif #endif
if (strcasecmp (walk->name, "channel") == 0) { if (strcasecmp (walk->name, "channel") == 0) {
channel = walk; channel = walk;
rewalk = channel->childs; rewalk = channel->children;
} }
if (strcasecmp (walk->name, "image") == 0) { if (strcasecmp (walk->name, "image") == 0) {
image = walk; image = walk;
@ -246,8 +246,8 @@ tree_walk (xmlNodePtr root,
return; return;
} }
t = layer_find(channel->childs, "title", ""); t = layer_find(channel->children, "title", "");
u = layer_find(channel->childs, "link", ""); u = layer_find(channel->children, "link", "");
if (*u != '\0') if (*u != '\0')
g_string_sprintfa (html, "<a href=\"%s\">", u); g_string_sprintfa (html, "<a href=\"%s\">", u);
@ -271,9 +271,9 @@ tree_walk (xmlNodePtr root,
items = MIN (limit, items); items = MIN (limit, items);
for (i = 0; i < items; i++) { for (i = 0; i < items; i++) {
char *p = layer_find (item[i]->childs, "title", "No information"); char *p = layer_find (item[i]->children, "title", "No information");
tmp = g_strdup_printf ("<LI><font size=\"-1\"><A href=\"%s\">\n", layer_find_url(item[i]->childs, "link", "")); tmp = g_strdup_printf ("<LI><font size=\"-1\"><A href=\"%s\">\n", layer_find_url(item[i]->children, "link", ""));
g_string_append (html, tmp); g_string_append (html, tmp);
g_free (tmp); g_free (tmp);
@ -309,7 +309,7 @@ display_doc (RDF *r)
g_string_append (html, "</dt>"); g_string_append (html, "</dt>");
g_free (tmp_utf); g_free (tmp_utf);
} else { } else {
tree_walk (r->cache->root, r, html); tree_walk (xmlDocGetRootElement (r->cache), r, html);
} }
g_free (r->html); g_free (r->html);