[uim-commit] r248 - trunk/scm

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-11 01:14:44 -0800 (Tue, 11 Jan 2005)
New Revision: 248

Modified:
   trunk/scm/custom-vars.scm
   trunk/scm/util.scm
Log:
* scm/util.scm
  - (candidate-window-position): Remove since unused
test/test-custom.scm
  - (custom candidate-window-position): Remove since unused
  - (custom canna-server-name): Remove. This custom variable caused
    duplicate "Canna server name" item on uim-pref
  - (custom-hook-literalize-preserved-canna-server-name): New procedure
  - Add custom-hook-literalize-preserved-canna-server-name to
    custom-literalize-hooks to output cannaserver definition to
    custom-canna.scm


Modified: trunk/scm/custom-vars.scm
===================================================================
--- trunk/scm/custom-vars.scm	2005-01-11 08:47:27 UTC (rev 247)
+++ trunk/scm/custom-vars.scm	2005-01-11 09:14:44 UTC (rev 248)
@@ -213,12 +213,6 @@
 		 (lambda ()
 		   enable-im-switch))
 
-(define-custom 'candidate-window-position "caret"
-  '(global)
-  '(string "^(caret|left|right)$")
-  (_ "Candidate window position")
-  (_ "long description will be here."))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; anthy
@@ -320,12 +314,6 @@
   (_ "Canna server name")
   (_ "long description will be here."))
 
-(define-custom 'canna-server-name ""
-  '(canna cannaserver)
-  '(string ".*")
-  (_ "Canna server name")
-  (_ "long description will be here."))
-
 ;; activity dependency
 (custom-add-hook 'custom-preserved-canna-server-name
 		 'custom-activity-hooks
@@ -361,6 +349,22 @@
 		 'custom-set-hooks
 		 custom-hook-set-canna-server-name)
 
+(define custom-hook-literalize-preserved-canna-server-name
+  (lambda ()
+    (string-append
+     "(define custom-preserved-canna-server-name "
+     (custom-value-as-literal 'custom-preserved-canna-server-name)
+     ")\n"
+     "(define canna-server-name "
+     (if canna-server-name
+	 (string-append "\"" canna-server-name "\"")
+	 "#f")
+     ")")))
+
+(custom-add-hook 'custom-preserved-canna-server-name
+		 'custom-literalize-hooks
+		 custom-hook-literalize-preserved-canna-server-name)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; skk

Modified: trunk/scm/util.scm
===================================================================
--- trunk/scm/util.scm	2005-01-11 08:47:27 UTC (rev 247)
+++ trunk/scm/util.scm	2005-01-11 09:14:44 UTC (rev 248)
@@ -519,6 +519,3 @@
       multi-segment-type-hiragana)
      ((= kana multi-segment-type-hankana)
       multi-segment-type-hiragana))))
-
-
-(define candidate-window-position "caret")