From 4a3dd895506ba7bd372928ca6d88a1e53143e284 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@cs.utexas.edu>
Date: Wed, 9 Jan 2002 21:42:01 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6562 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 lib/guile-www/ChangeLog      |  4 ++++
 src/engine/glib-helpers.c    | 25 ++++++++++++++++---------
 src/engine/gnc-engine-util.h |  1 -
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/guile-www/ChangeLog b/lib/guile-www/ChangeLog
index 81f266e666..9f2550e371 100644
--- a/lib/guile-www/ChangeLog
+++ b/lib/guile-www/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-09  Rob Browning  <rlb@defaultvalue.org>
+
+	* Makefile.am: handle conditional install inclusion of GUILE_WWW.
+
 2001-12-08  Dave Peticolas  <dave@krondo.com>
 
 	* Makefile.am (Repository): clean .scm-links
diff --git a/src/engine/glib-helpers.c b/src/engine/glib-helpers.c
index 1714bfe88c..b65a76e9c0 100644
--- a/src/engine/glib-helpers.c
+++ b/src/engine/glib-helpers.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include <g-wrap-runtime-guile.h>
+#include <g-wrap-wct.h>
 
 #include "glib-helpers.h"
 
@@ -72,15 +72,16 @@ gnc_scm_list_to_glist(SCM rest)
     if (scm_item == SCM_BOOL_F)
     {
       result = g_list_prepend(result, NULL);
-      continue;
     }
-
-    if (!gw_wcp_p(scm_item))
-      scm_misc_error("gnc_scm_list_to_glist",
-                     "Item in list not a gw:wcp.", scm_item);
-
-    item = gw_wcp_get_ptr(scm_item);
-    result = g_list_prepend(result, item);
+    else
+    {
+      if (!gw_wcp_p(scm_item))
+        scm_misc_error("gnc_scm_list_to_glist",
+                       "Item in list not a gw:wcp.", scm_item);
+      
+      item = gw_wcp_get_ptr(scm_item);
+      result = g_list_prepend(result, item);
+    }
   }
 
   return g_list_reverse(result);
@@ -120,6 +121,9 @@ gnc_glist_scm_for_each(SCM wct, SCM thunk, GList *glist)
 
 /********************************************************************
  * gnc_glist_string_to_scm
+ * i.e. (glist-of (<gw:mchars> calee-owned) callee-owned)
+ * or equivalently
+ * i.e. (glist-of (<gw:gchars> calee-owned) callee-owned)
  ********************************************************************/
 SCM
 gnc_glist_string_to_scm(GList *glist)
@@ -138,6 +142,9 @@ gnc_glist_string_to_scm(GList *glist)
 
 /********************************************************************
  * gnc_scm_to_glist_string
+ * i.e. (glist-of (<gw:mchars> calee-owned) callee-owned)
+ * or equivalently
+ * i.e. (glist-of (<gw:gchars> calee-owned) callee-owned)
  ********************************************************************/
 
 GList *
diff --git a/src/engine/gnc-engine-util.h b/src/engine/gnc-engine-util.h
index 57da9d2af0..72d1916ca7 100644
--- a/src/engine/gnc-engine-util.h
+++ b/src/engine/gnc-engine-util.h
@@ -185,7 +185,6 @@ void gnc_set_logfile (FILE *outfile);
 #define DEQEPS(x,y,eps) (((((x)+(eps))>(y)) ? 1 : 0) && ((((x)-(eps))<(y)) ? 1 : 0))
 #define DEQ(x,y) DEQEPS(x,y,EPS)
 
-
 #define SAFE_STRCMP(da,db) {		\
   if ((da) && (db)) {			\
     int retval = strcmp ((da), (db));	\