evolution-rss r201 - in trunk: . pixmaps src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Mar  3 10:55:25 2008
New Revision: 201
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=201&view=rev

Log:
xml emelemnt, xml text fixes

Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/config.h.in
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.in
   trunk/src/rss.c

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Mon Mar  3 10:55:25 2008
@@ -135,6 +135,7 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
+HAVE_LIBXUL = @HAVE_LIBXUL@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Mon Mar  3 10:55:25 2008
@@ -48,6 +48,9 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
+/* libxul flavour of xulrunner */
+#undef HAVE_LIBXUL
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Mon Mar  3 10:55:25 2008
@@ -117,6 +117,7 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
+HAVE_LIBXUL = @HAVE_LIBXUL@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Mon Mar  3 10:55:25 2008
@@ -162,6 +162,7 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
+HAVE_LIBXUL = @HAVE_LIBXUL@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Mar  3 10:55:25 2008
@@ -3332,6 +3332,7 @@
 	gchar *content;
 
 	content = xmlNodeGetContent(node);
+	g_print("dublin content:%s|\n", content);
 	if (content)
 		return content;
 	else
@@ -3390,21 +3391,29 @@
 				{
 					func = (gpointer)standard_rss_modules[i][2];
 					if (strcasecmp (node->ns->prefix, match)==0)
+					{
+						xmlBufferFree(buf);
 						return func(node, fail);
+					}
 				}
 			}
 		}
                 if (strcasecmp (node->name, match)==0) {
-//		g_print("node children:%s|\n", node->children);
-//		if (node->children)
-//		g_print("node children next:%s|\n", node->children->next);
-                        if (node->children != NULL 
-			&& node->children->next != NULL) {
+		g_print("node children:%s|\n", node->children);
+		if (node->children)
+		{
+		g_print("node type:%d|\n", node->children->type);
+		g_print("node children next:%s|\n", node->children->next);
+		}
+                        if (node->children->type == 1 && (node->children != NULL 
+			|| node->children->next != NULL)) {
 #ifdef RDF_DEBUG
 				g_print("NODE DUMP:%s\n", xmlNodeGetContent(node->children->next));
 #endif
+				g_print("NODE DUMP:%s\n", xmlNodeGetContent(node->children));
 				len = xmlNodeDump(buf, node->doc, node->children, 0, 0);
 				content = g_strdup_printf("%s", xmlBufferContent(buf));
+				g_print("NODE DUMP:%s\n", content);
 				xmlBufferFree(buf);
 				return content;
                         } else {