Revision: 6741 Author: ek.kato Date: Tue Sep 7 07:44:36 2010 Log: * Merge r6740 from trunk.
http://code.google.com/p/uim/source/detail?r=6741 Modified: /branches/1.6/scm/dynlib.scm /branches/1.6/scm/plugin.scm ======================================= --- /branches/1.6/scm/dynlib.scm Thu May 6 22:55:35 2010 +++ /branches/1.6/scm/dynlib.scm Tue Sep 7 07:44:36 2010 @@ -34,14 +34,15 @@ (define uim-dynlib-load-path (if (setugid?) (list (string-append (sys-pkglibdir) "/plugin")) - (let ((home-dir (or (home-directory (user-name)) "")) - (ld-library-path (getenv "LD_LIBRARY_PATH"))) + (let* ((ld-library-path (getenv "LD_LIBRARY_PATH")) + (config-path (get-config-path! #f)) + (user-plugin-path (if config-path + (string-append config-path "/plugin") + '()))) (filter string? (append (list (getenv "LIBUIM_PLUGIN_LIB_DIR") - (if home-dir - (string-append (get-config-path! #f) "/plugin") - '()) - (string-append (sys-pkglibdir) "/plugin")) + user-plugin-path + (string-append (sys-pkglibdir) "/plugin")) ;; XXX (if ld-library-path (string-split ld-library-path ":") ======================================= --- /branches/1.6/scm/plugin.scm Thu Aug 5 19:09:23 2010 +++ /branches/1.6/scm/plugin.scm Tue Sep 7 07:44:36 2010 @@ -39,12 +39,12 @@ (define uim-plugin-scm-load-path (if (setugid?) (list (sys-pkgdatadir)) - (let ((home-dir (or (home-directory (user-name)) "")) + (let ((config-path (get-config-path! #f)) (scm-paths (string-split (load-path) ":"))) (filter string? (append scm-paths - (if home-dir - (list (string-append (get-config-path! #f) "/plugin")) + (if config-path + (list (string-append config-path "/plugin")) '()) (list (sys-pkgdatadir))))))) @@ -71,9 +71,9 @@ ;; TODO: write test (define load-module-conf (lambda () - (let* ((home-dir (or (home-directory (user-name)) "")) - (user-module-dir (if home-dir - (string-append (get-config-path! #f) "/plugin/") + (let* ((config-path (get-config-path! #f)) + (user-module-dir (if config-path + (string-append config-path "/plugin/") #f)) (conf-file "installed-modules.scm") (user-conf-file (if user-module-dir @@ -100,9 +100,9 @@ ;; TODO: write test (define load-enabled-modules (lambda () - (let* ((home-dir (or (home-directory (user-name)) "")) - (user-module-dir (if home-dir - (string-append (get-config-path! #f) "/plugin/") + (let* ((config-path (get-config-path! #f)) + (user-module-dir (if config-path + (string-append config-path "/plugin/") #f)) (file "loader.scm") (user-file (if user-module-dir
