[uim-commit] r588 - trunk/scm

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-06 22:09:37 -0800 (Sun, 06 Feb 2005)
New Revision: 588

Modified:
   trunk/scm/custom.scm
Log:
* custom.scm: Fixed the bug that uim-pref doesn't work when
  the value of environment variable LIBUIM_VERBOSE is higher
  than 3.
 -(custom-choice-label): Added null? check.
 -(custom-choice-desc):  Added null? check.


Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm	2005-02-07 05:58:43 UTC (rev 587)
+++ trunk/scm/custom.scm	2005-02-07 06:09:37 UTC (rev 588)
@@ -349,16 +349,18 @@
 (define custom-choice-label
   (lambda (custom-sym val-sym)
     (let* ((sym-rec-alist (custom-type-attrs custom-sym))
-	   (srec (assq val-sym sym-rec-alist))
-	   (label (custom-choice-rec-label srec)))
-      label)))
+	   (srec (assq val-sym sym-rec-alist)))
+      (if (null? srec)
+	  ""
+	  (custom-choice-rec-label srec)))))
 
 (define custom-choice-desc
   (lambda (custom-sym val-sym)
     (let* ((sym-rec-alist (custom-type-attrs custom-sym))
-	   (srec (assq val-sym sym-rec-alist))
-	   (desc (custom-choice-rec-desc srec)))
-      desc)))
+	   (srec (assq val-sym sym-rec-alist)))
+      (if (null? srec)
+	  "" 
+	  (custom-choice-rec-desc srec)))))
 
 (define custom-choice-range-reflect-olist-val
   (lambda (dst-sym src-sym indication-alist)