--- rxvt-unicode/src/rxvttoolkit.C	2008/01/26 12:15:11	1.97
+++ rxvt-unicode/src/rxvttoolkit.C	2008/01/26 13:31:09	1.99
@@ -552,12 +552,12 @@
 
 #ifdef USE_XIM
       if (!XFilterEvent (&xev, None))
-#endif
         {
           if (xev.type == PropertyNotify
               && xev.xany.window == root
               && xev.xproperty.atom == xa[XA_XIM_SERVERS])
             im_change_check ();
+#endif
 
           if (xev.type == MappingNotify)
             XRefreshKeyboardMapping (&xev.xmapping);
@@ -569,16 +569,16 @@
               else if (xw[i]->window == xev.xany.window)
                 xw[i]->call (xev);
             }
+#ifdef USE_XIM
         }
+#endif
     }
 }
 
 void rxvt_display::flush_cb (ev::prepare &w, int revents)
 {
   while (XEventsQueued (dpy, QueuedAfterFlush))
-    {
-      x_cb(x_ev,0);//D
-    }
+    x_cb (x_ev, EV_READ);
 
   w.stop ();
 }