[uim] r6023 committed - * Port r6022 from trunk.

[codesite-noreply]

Revision: 6023
Author: iratqq
Date: Thu Oct  8 20:09:50 2009
Log: * Port r6022 from trunk.
http://code.google.com/p/uim/source/detail?r=6023

Modified:
 /branches/1.5/scm/Makefile.am
 /branches/1.5/uim/uim-notify.c

=======================================
--- /branches/1.5/scm/Makefile.am       Sun Oct 19 20:02:58 2008
+++ /branches/1.5/scm/Makefile.am       Thu Oct  8 20:09:50 2009
@@ -80,7 +80,8 @@
 UIM_MODULE_MANAGER_ENV = \
         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
         LIBUIM_SCM_FILES=$(abs_srcdir) \
-        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
+        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
+        UIM_DISABLE_NOTIFY=1

 installed-modules.scm loader.scm: $(SCM_FILES)
        $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim uim-module-manager && \
=======================================
--- /branches/1.5/uim/uim-notify.c      Tue Jan 20 18:16:35 2009
+++ /branches/1.5/uim/uim-notify.c      Thu Oct  8 20:09:50 2009
@@ -109,7 +109,7 @@
     return UIM_FALSE;
   }

-  if (strcmp(agent->desc()->name, name) == 0) {
+  if (getenv("UIM_DISABLE_NOTIFY") != NULL || strcmp(agent->desc()->name,  
name) == 0) {
     return UIM_TRUE;
   } else if (strcmp(name, "stderr") == 0) {
     agent->quit();
@@ -238,6 +238,10 @@
                    MAKE_STR(desc->name),
                    MAKE_STR(desc->desc)),
              uim_scm_null());
+
+  if (getenv("UIM_DISABLE_NOTIFY") != NULL)
+    return uim_scm_callf("reverse", "o", ret_);
+
   dirp = opendir(NOTIFY_PLUGIN_PATH);
   if (dirp) {
     while ((dp = readdir(dirp)) != NULL) {