--- rdesktop-1.3.1/xwin.c	Wed Aug 25 22:02:52 2004
+++ rdesktop-1.3.1/xwin.c~	Wed Aug 25 22:08:09 2004
@@ -836,8 +836,8 @@
 
 	xkeymap_init();
 
-	if (g_enable_compose)
-		g_IM = XOpenIM(g_display, NULL, NULL, NULL);
+//	if (g_enable_compose)
+//		g_IM = XOpenIM(g_display, NULL, NULL, NULL);
 
 	xclip_init();
 
@@ -849,8 +849,8 @@
 void
 ui_deinit(void)
 {
-	if (g_IM != NULL)
-		XCloseIM(g_IM);
+//	if (g_IM != NULL)
+//		XCloseIM(g_IM);
 
 	XFreeModifiermap(g_mod_map);
 
@@ -943,12 +943,12 @@
 
 	if (g_IM != NULL)
 	{
-		g_IC = XCreateIC(g_IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
-				 XNClientWindow, g_wnd, XNFocusWindow, g_wnd, NULL);
+//		g_IC = XCreateIC(g_IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
+//				 XNClientWindow, g_wnd, XNFocusWindow, g_wnd, NULL);
 
-		if ((g_IC != NULL)
-		    && (XGetICValues(g_IC, XNFilterEvents, &ic_input_mask, NULL) == NULL))
-			input_mask |= ic_input_mask;
+//		if ((g_IC != NULL)
+//		    && (XGetICValues(g_IC, XNFilterEvents, &ic_input_mask, NULL) == NULL))
+//			input_mask |= ic_input_mask;
 	}
 
 	XSelectInput(g_display, g_wnd, input_mask);
@@ -978,8 +978,8 @@
 void
 ui_destroy_window(void)
 {
-	if (g_IC != NULL)
-		XDestroyIC(g_IC);
+//	if (g_IC != NULL)
+//		XDestroyIC(g_IC);
 
 	XDestroyWindow(g_display, g_wnd);
 }
@@ -1049,15 +1049,15 @@
 				if (g_IC != NULL)
 					/* Multi_key compatible version */
 				{
-					XmbLookupString(g_IC,
-							&xevent.xkey, str, sizeof(str), &keysym,
-							&status);
-					if (!((status == XLookupKeySym) || (status == XLookupBoth)))
-					{
-						error("XmbLookupString failed with status 0x%x\n",
-						      status);
-						break;
-					}
+//					XmbLookupString(g_IC,
+//							&xevent.xkey, str, sizeof(str), &keysym,
+//							&status);
+//					if (!((status == XLookupKeySym) || (status == XLookupBoth)))
+//					{
+//						error("XmbLookupString failed with status 0x%x\n",
+//						      status);
+//						break;
+//					}
 				}
 				else
 				{