[uim-commit] r990 - in branches/r5rs: . scm

[tkng at freedesktop.org]

Author: tkng
Date: 2005-07-20 22:06:31 -0700 (Wed, 20 Jul 2005)
New Revision: 990

Modified:
   branches/r5rs/
   branches/r5rs/scm/canna.scm
Log:
 r987 at t42 (orig r986):  tkng | 2005-07-20 07:28:11 +0900
 * scm/canna.scm: Removed check whether can connect to canna server, because
   it cannot correspond to new uim-module-manager. If this check is really
   need, please revert this commit.
 



Property changes on: branches/r5rs
___________________________________________________________________
Name: svk:merge
   + fb73e508-85ea-0310-95c3-a85c473e0941:/trunk:986

Modified: branches/r5rs/scm/canna.scm
===================================================================
--- branches/r5rs/scm/canna.scm	2005-07-20 23:42:00 UTC (rev 989)
+++ branches/r5rs/scm/canna.scm	2005-07-21 05:06:31 UTC (rev 990)
@@ -746,29 +746,20 @@
       (canna-begin-input cc)
       (im-commit-raw cc)))
 
-(if (and
-     (symbol-bound? 'canna-lib-init)
-     (canna-lib-init canna-server-name))
-    (set! canna-init-lib-ok? #t))
-
-(if (and
-     (symbol-bound? 'canna-lib-init)
-     (= canna-init-lib-ok? #t))
-    (begin
-      (canna-configure-widgets)
-      (register-im
-       'canna
-       "ja"
-       "EUC-JP"
-       canna-im-name-label
-       canna-im-short-desc
-       #f
-       canna-init-handler
-       canna-release-handler
-       context-mode-handler
-       canna-press-key-handler
-       canna-release-key-handler
-       canna-reset-handler
-       canna-get-candidate-handler
-       canna-set-candidate-index-handler
-       context-prop-activate-handler)))
+(canna-configure-widgets)
+(register-im
+ 'canna
+ "ja"
+ "EUC-JP"
+ canna-im-name-label
+ canna-im-short-desc
+ #f
+ canna-init-handler
+ canna-release-handler
+ context-mode-handler
+ canna-press-key-handler
+ canna-release-key-handler
+ canna-reset-handler
+ canna-get-candidate-handler
+ canna-set-candidate-index-handler
+ context-prop-activate-handler)