Revision: 6656
Author: ek.kato
Date: Mon Aug 2 23:04:13 2010
Log: * scm/prime-custom.scm (prime-command-path) : New.
* scm/prime.scm
- (prime-open-with-unix-domain-socket)
- (prime-connection-init)
- Use prime-command-path.
http://code.google.com/p/uim/source/detail?r=6656
Modified:
/trunk/scm/prime-custom.scm
/trunk/scm/prime.scm
=======================================
--- /trunk/scm/prime-custom.scm Mon Apr 26 23:25:31 2010
+++ /trunk/scm/prime-custom.scm Mon Aug 2 23:04:13 2010
@@ -104,6 +104,12 @@
(N_ "Prime connection setting")
(N_ "long description will be here."))
+(define-custom 'prime-command-path "prime"
+ '(prime advanced)
+ '(pathname regular-file)
+ (N_ "Prime command path")
+ (N_ "long description will be here."))
+
(define-custom 'prime-tcpserver-name "localhost"
'(prime advanced)
'(string ".*")
=======================================
--- /trunk/scm/prime.scm Mon Aug 2 22:24:42 2010
+++ /trunk/scm/prime.scm Mon Aug 2 23:04:13 2010
@@ -825,7 +825,7 @@
(or fds
(begin
(unlink socket-path)
- (process-with-daemon "prime" (list "prime" "-u" socket-path))
+ (process-with-daemon prime-command-path (list
prime-command-path "-u" socket-path))
(let loop ((fds (prime-open-unix-domain-socket socket-path))
(giveup 10))
(cond ((= giveup 0)
@@ -865,7 +865,7 @@
((eq? prime-server-setting? 'tcpserver)
(prime-open-with-tcp-socket prime-tcpserver-name
prime-tcpserver-port))
((eq? prime-server-setting? 'pipe)
- (prime-open-with-pipe "prime"))
+ (prime-open-with-pipe prime-command-path))
(else
(uim-notify-fatal (N_ "Prime connection is not
defined"))
#f))))
