[uim-commit] r459 - in trunk: scm uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-02-01 03:31:23 -0800 (Tue, 01 Feb 2005)
New Revision: 459

Modified:
   trunk/scm/init.scm
   trunk/uim/uim-compat-scm.c
Log:
* uim/uim-compat-scm.c
  - (uim_scm_symbol_value_bool): Fix invalid result acquisition

* scm/init.scm
  - (load-modules): Fix lazy loading of direct IM


Modified: trunk/scm/init.scm
===================================================================
--- trunk/scm/init.scm	2005-02-01 09:42:00 UTC (rev 458)
+++ trunk/scm/init.scm	2005-02-01 11:31:23 UTC (rev 459)
@@ -60,6 +60,9 @@
 
 (define load-modules
   (lambda ()
+    (if (not (memq 'direct enabled-im-list))
+	(set! enabled-im-list (append enabled-im-list '(direct))))
+
     (if (getenv "LIBUIM_VANILLA")
 	(set! enable-lazy-loading? #f)
 	(begin
@@ -67,9 +70,6 @@
 	      (require "lazy-load.scm"))
 	  (load-enabled-modules)))
 
-    (if (not (memq 'direct enabled-im-list))
-	(set! enabled-im-list (append enabled-im-list '(direct))))
-
     ;; must be loaded at last of IMs
     (if (not (retrieve-im 'direct))
 	(require-module "direct"))))

Modified: trunk/uim/uim-compat-scm.c
===================================================================
--- trunk/uim/uim-compat-scm.c	2005-02-01 09:42:00 UTC (rev 458)
+++ trunk/uim/uim-compat-scm.c	2005-02-01 11:31:23 UTC (rev 459)
@@ -133,7 +133,7 @@
     return UIM_FALSE;
 
   UIM_EVAL_FSTRING1(NULL, "(symbol-value '%s)", symbol_str);
-  val = uim_scm_c_bool(uim_scm_return_value);
+  val = uim_scm_c_bool(uim_scm_return_value());
 
   return val;
 }