--- gdk-support.c.~1.24.~	2003-06-19 11:03:47.000000000 +1000
+++ gdk-support.c	2003-07-07 17:17:28.000000000 +1000
@@ -1501,17 +1501,21 @@
 }
 #undef FUNCNAME
 
-SCM
-gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding, gint *format)
+gint
+gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding, gint *format,
+                                    SCM *textp)
 {
   guchar *ctext;
-  gint length;
-  SCM text;
-  if (gdk_string_to_compound_text (str, encoding, format, &ctext, &length))
-    return SCM_BOOL_F;
-  text = scm_mem2string ((char *) ctext, length);
-  gdk_free_compound_text (ctext);
-  return text;
+  gint ret, length;
+  ret = gdk_string_to_compound_text (str, encoding, format, &ctext, &length);
+  if (ctext != NULL)
+    {
+      *textp = scm_mem2string ((char *) ctext, length);
+      gdk_free_compound_text (ctext);
+    }
+  else
+    *textp = SCM_BOOL_F;
+  return ret;
 }
 
 SCM