Revision: 6579
Author: deton.kih
Date: Sat Jul 24 17:48:54 2010
Log: * scm/tutcode.scm
- (tutcode-context-new, tutcode-begin-conversion):
Fix error when libuim-skk.so is not available.
http://code.google.com/p/uim/source/detail?r=6579
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Sat Jul 24 14:35:14 2010
+++ /trunk/scm/tutcode.scm Sat Jul 24 17:48:54 2010
@@ -97,6 +97,7 @@
(require-dynlib "skk")
(require "tutcode-bushudic.scm") ;Éô¼ó¹çÀ®ÊÑ´¹¼½ñ
(require "tutcode-kigoudic.scm") ;µ¹æÆþÎϥ⡼¥ÉÍѤε¹æɽ
+(require "tutcode-dialog.scm"); ¸ò¤¼½ñ¤ÊÑ´¹¼½ñ¤«¤é¤Îºï½ü³Îǧ¥À¥¤¥¢¥í¥°
;;; user configs
@@ -414,13 +415,19 @@
;;; @return À¸À®¤·¤¿¥³¥ó¥Æ¥¥¹¥È
(define (tutcode-context-new id im)
(if (not tutcode-dic-init)
- (begin
- (set! tutcode-dic-init #t)
- (if tutcode-use-recursive-learning?
- (require "tutcode-editor.scm"))
- (require "tutcode-dialog.scm")
- (skk-lib-dic-open tutcode-dic-filename #f "localhost" 0 'unspecified)
- (tutcode-read-personal-dictionary)))
+ (if (not (symbol-bound? 'skk-lib-dic-open))
+ (begin
+ (if (symbol-bound? 'uim-notify-info)
+ (uim-notify-info
+ (N_ "libuim-skk.so is not available. Mazegaki conversion is
disabled")))
+ (set! tutcode-use-recursive-learning? #f)
+ (set! tutcode-enable-mazegaki-learning? #f))
+ (begin
+ (skk-lib-dic-open tutcode-dic-filename #f "localhost"
0 'unspecified)
+ (if tutcode-use-recursive-learning?
+ (require "tutcode-editor.scm"))
+ (set! tutcode-dic-init #t)
+ (tutcode-read-personal-dictionary))))
(let ((tc (tutcode-context-new-internal id im)))
(tutcode-context-set-widgets! tc tutcode-widgets)
(if (null? tutcode-rule)
@@ -704,7 +711,8 @@
;;; @param pc ¥³¥ó¥Æ¥¥¹¥È¥ê¥¹¥È
(define (tutcode-begin-conversion pc)
(let* ((yomi (tutcode-make-string (tutcode-context-head pc)))
- (res (skk-lib-get-entry yomi "" "" #f)))
+ (res (and (symbol-bound? 'skk-lib-get-entry)
+ (skk-lib-get-entry yomi "" "" #f))))
(if res
(begin
(tutcode-context-set-nth! pc 0)
