From 60d890a26c81ee5fe3b6aeb587095ddc891d1871 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Thu, 26 Feb 2004 03:56:43 +0000 Subject: [PATCH] 2004-02-25 Jim Evins * configure.in: Changed version to 2.0pre1cvs * libglabels/xml-template.c: (gl_xml_template_parse_templates_doc): Removed extra xmlFreeDoc() calls upon error. Also print the doc->URL instead of doc->name fields when errors encountered. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@421 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 9 +++++++++ glabels2/configure.in | 2 +- glabels2/libglabels/xml-template.c | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index b238c154..81cb7df8 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,12 @@ +2004-02-25 Jim Evins + + * configure.in: + Changed version to 2.0pre1cvs + + * libglabels/xml-template.c: (gl_xml_template_parse_templates_doc): + Removed extra xmlFreeDoc() calls upon error. Also print the doc->URL + instead of doc->name fields when errors encountered. + 2004-02-21 Jim Evins * data/avery-iso-templates.xml: diff --git a/glabels2/configure.in b/glabels2/configure.in index 5fdb6e9a..32279af9 100644 --- a/glabels2/configure.in +++ b/glabels2/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(glabels, 1.93.3, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +AC_INIT(glabels, 2.0pre1cvs, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) AC_CONFIG_SRCDIR(src/glabels.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c index 92d87cc0..809454b8 100644 --- a/glabels2/libglabels/xml-template.c +++ b/glabels2/libglabels/xml-template.c @@ -129,14 +129,12 @@ gl_xml_template_parse_templates_doc (const xmlDocPtr templates_doc) root = xmlDocGetRootElement (templates_doc); if (!root || !root->name) { g_warning ("\"%s\" is not a glabels template file (no root node)", - templates_doc->name); - xmlFreeDoc (templates_doc); + templates_doc->URL); return templates; } if (!xmlStrEqual (root->name, "Glabels-templates")) { g_warning ("\"%s\" is not a glabels template file (wrong root node)", - templates_doc->name); - xmlFreeDoc (templates_doc); + templates_doc->URL); return templates; } -- 2.39.5