Revision: 6374 Author: ek.kato Date: Thu May 6 17:38:09 2010 Log: * uim/uim-custom.c (uim_custom_enable) * scm/annotation-eb.scm * scm/look.scm - Use require-dynlib instead of module-load.
http://code.google.com/p/uim/source/detail?r=6374 Modified: /trunk/scm/annotation-eb.scm /trunk/scm/look.scm /trunk/uim/uim-custom.c ======================================= --- /trunk/scm/annotation-eb.scm Tue Apr 27 18:51:37 2010 +++ /trunk/scm/annotation-eb.scm Thu May 6 17:38:09 2010 @@ -28,10 +28,8 @@ ;;; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ;;; SUCH DAMAGE. ;;;; -(and (not (provided? "eb")) - (guard (err (else #f)) - (module-load "eb")) - (provide "eb")) +(and (require-dynlib "eb") + (provide "eb")) (define eb-ctx #f) ======================================= --- /trunk/scm/look.scm Sun Apr 4 20:35:54 2010 +++ /trunk/scm/look.scm Thu May 6 17:38:09 2010 @@ -33,10 +33,8 @@ (require-custom "generic-key-custom.scm") (require-custom "look-custom.scm") -(and (not (provided? "eb")) - (guard (err (else #f)) - (module-load "eb")) - (provide "eb")) +(and (require-dynlib "eb") + (provided "eb")) ;; widgets (define look-widgets '(widget_look_input_mode)) ======================================= --- /trunk/uim/uim-custom.c Sun Apr 4 20:35:54 2010 +++ /trunk/uim/uim-custom.c Thu May 6 17:38:09 2010 @@ -962,7 +962,7 @@ uim_bool uim_custom_enable(void) { - UIM_EVAL_STRING(NULL, "(module-load \"custom-enabler\")"); + UIM_EVAL_STRING(NULL, "(require-dynlib \"custom-enabler\")"); return uim_scm_c_bool(uim_scm_return_value()); }
