[uim-commit] r166 - in trunk: test uim

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-08 01:37:47 -0800 (Sat, 08 Jan 2005)
New Revision: 166

Modified:
   trunk/test/uim-test-utils.scm
   trunk/uim/uim.c
Log:
* test/uim-test-utils.scm
  - Set environment variable LIBUIM_VANILLA to 1 to suppress loading
    per-user configuration
* uim/uim.c
  - (uim_init_scm): Suppress uim_custom_load() when LIBUIM_VANILLA is
    set


Modified: trunk/test/uim-test-utils.scm
===================================================================
--- trunk/test/uim-test-utils.scm	2005-01-08 07:11:17 UTC (rev 165)
+++ trunk/test/uim-test-utils.scm	2005-01-08 09:37:47 UTC (rev 166)
@@ -6,6 +6,7 @@
 
 (sys-putenv "LIBUIM_SCM_FILES" "./scm")
 (sys-putenv "LIBUIM_VERBOSE" "1")  ;; must be 1
+(sys-putenv "LIBUIM_VANILLA" "1")
 
 (set! (port-buffering (current-output-port)) :none)
 

Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c	2005-01-08 07:11:17 UTC (rev 165)
+++ trunk/uim/uim.c	2005-01-08 09:37:47 UTC (rev 166)
@@ -669,7 +669,9 @@
 #endif
 #ifndef UIM_COMPAT_CUSTOM
   /* must be loaded after IMs and before user conf */
-  uim_custom_load();
+  if (!getenv("LIBUIM_VANILLA")) {
+    uim_custom_load();
+  }
 #endif    
   if (getenv("LIBUIM_VANILLA") ||
       load_conf() == -1) {