? tests/.deps
? tests/.libs
Index: gtk-doc.make
===================================================================
RCS file: /cvs/gnome/libsoup/gtk-doc.make,v
retrieving revision 1.7
diff -u -p -r1.7 gtk-doc.make
--- gtk-doc.make	27 Oct 2005 13:59:24 -0000	1.7
+++ gtk-doc.make	10 Jun 2006 03:18:42 -0000
@@ -46,7 +46,7 @@ all-local: html-build.stamp
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '*** Scanning header files ***'
+	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
@@ -66,7 +66,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES):
 #### templates ####
 
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
+	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	touch tmpl-build.stamp
@@ -76,11 +76,11 @@ tmpl.stamp: tmpl-build.stamp
 
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '*** Building XML ***'
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -89,13 +89,13 @@ sgml.stamp: sgml-build.stamp
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
+	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
 	rm -rf $(srcdir)/html 
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
+	@echo 'gtk-doc: Fixing cross-references' 
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 else
Index: libsoup/soup-xmlrpc-response.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-xmlrpc-response.c,v
retrieving revision 1.5
diff -u -p -r1.5 soup-xmlrpc-response.c
--- libsoup/soup-xmlrpc-response.c	8 Jun 2006 12:40:19 -0000	1.5
+++ libsoup/soup-xmlrpc-response.c	10 Jun 2006 03:18:42 -0000
@@ -251,12 +251,14 @@ soup_xmlrpc_value_get_int (SoupXmlrpcVal
 	/* FIXME this should be exactly one text node */
 	content = xmlNodeGetContent (xml);
 	*i = strtol ((char *)content, &tail, 10);
-	xmlFree (content);
 
-	if (*tail != '\0')
+	if (*tail != '\0') {
+		xmlFree (content);
 		return FALSE;
-	else
+	} else {
+		xmlFree (content);
 		return TRUE;
+	}
 }
 
 gboolean
@@ -277,12 +279,14 @@ soup_xmlrpc_value_get_double (SoupXmlrpc
 	/* FIXME this should be exactly one text node */
 	content = xmlNodeGetContent (xml);
 	*b = g_ascii_strtod ((char *)content, &tail);
-	xmlFree (content);
 
-	if (*tail != '\0')
+	if (*tail != '\0') {
+		xmlFree (content);
 		return FALSE;
-	else
+	} else {
+		xmlFree (content);
 		return TRUE;
+	}
 }
 
 gboolean
@@ -303,10 +307,11 @@ soup_xmlrpc_value_get_boolean (SoupXmlrp
 
 	content = xmlNodeGetContent (xml);
 	i = strtol ((char *)content, &tail, 10);
-	xmlFree (content);
 
 	if (*tail != '\0')
 		return FALSE;
+	
+	xmlFree (content);
 
 	if (i != 0 && i != 1)
 		return FALSE;
