Index: libx11-1.0.3/modules/im/ximcp/imThaiIm.c
===================================================================
--- libx11-1.0.3.orig/modules/im/ximcp/imThaiIm.c	2008-04-26 16:27:48.000000000 +0700
+++ libx11-1.0.3/modules/im/ximcp/imThaiIm.c	2008-04-26 16:46:58.000000000 +0700
@@ -67,7 +67,13 @@
     char *language;
 
     _XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL);
-    if(strcmp(language, THAI_LANGUAGE_NAME) == 0) {
+    if(strcmp(language, THAI_LANGUAGE_NAME) == 0 &&
+       (strcmp(im->core.im_name, "") == 0 ||
+        strcmp(im->core.im_name, "BasicCheck") == 0 ||
+        strcmp(im->core.im_name, "Strict") == 0 ||
+        strcmp(im->core.im_name, "Thaicat") == 0 ||
+        strcmp(im->core.im_name, "Passthrough") == 0))
+    {
 	return(True);
     }
     return(False);