Author: iratqq
Date: Fri Feb 27 04:28:07 2009
New Revision: 5869
Modified:
trunk/scm/custom-rt.scm
trunk/scm/plugin.scm
Log:
* scm/plugin.scm (uim-plugin-lib-load-path)
(uim-plugin-scm-load-path, load-module-conf)
(load-enabled-modules):
- Use (get-config-path!)
* scm/custom-rt.scm (custom-file-path):
- Ditto.
Modified: trunk/scm/custom-rt.scm
==============================================================================
--- trunk/scm/custom-rt.scm (original)
+++ trunk/scm/custom-rt.scm Fri Feb 27 04:28:07 2009
@@ -63,8 +63,8 @@
(define custom-file-path
(lambda (gsym)
(let* ((group-name (symbol->string gsym))
- (path (string-append (or (home-directory (user-name)) "")
- "/.uim.d/customs/custom-"
+ (path (string-append (get-config-path! #f)
+ "/customs/custom-"
group-name
".scm")))
path)))
Modified: trunk/scm/plugin.scm
==============================================================================
--- trunk/scm/plugin.scm (original)
+++ trunk/scm/plugin.scm Fri Feb 27 04:28:07 2009
@@ -42,7 +42,7 @@
(filter string?
(append (list (getenv "LIBUIM_PLUGIN_LIB_DIR")
(if home-dir
- (string-append home-dir "/.uim.d/plugin")
+ (string-append (get-config-path! #f)
"/plugin")
'())
(string-append (sys-pkglibdir) "/plugin"))
;; XXX
@@ -57,7 +57,7 @@
(filter string?
(list (getenv "LIBUIM_SCM_FILES")
(if home-dir
- (string-append home-dir "/.uim.d/plugin")
+ (string-append (get-config-path! #f) "/plugin")
'())
(sys-pkgdatadir))))))
@@ -130,7 +130,7 @@
(lambda ()
(let* ((home-dir (or (home-directory (user-name)) ""))
(user-module-dir (if home-dir
- (string-append home-dir "/.uim.d/plugin/")
+ (string-append (get-config-path! #f) "/plugin/")
#f))
(conf-file "installed-modules.scm")
(user-conf-file (if user-module-dir
@@ -157,7 +157,7 @@
(lambda ()
(let* ((home-dir (or (home-directory (user-name)) ""))
(user-module-dir (if home-dir
- (string-append home-dir "/.uim.d/plugin/")
+ (string-append (get-config-path! #f) "/plugin/")
#f))
(file "loader.scm")
(user-file (if user-module-dir
