# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1183058966 0
# Node ID 3270e88063a2d26add34954317ed204a1bf7e5d3
# Parent  00486a9c2893b2ef732ccaf8ae2d4613b4f4b70e
Corrected mismerge of XIM patch, thanks Alissa!

  Fixes Bugzilla #429.

diff -r 00486a9c2893 -r 3270e88063a2 src/video/x11/SDL_x11video.c
--- a/src/video/x11/SDL_x11video.c	Thu Jun 28 08:33:59 2007 +0000
+++ b/src/video/x11/SDL_x11video.c	Thu Jun 28 19:29:26 2007 +0000
@@ -502,7 +502,6 @@
 		}
 
 		/* Create a new input context for the new window just created.  */
-		SDL_IM = XOpenIM(SDL_Display, NULL, classname, classname);
 		if (SDL_IM == NULL) {
 			SDL_SetError("no input method could be opened");
 		} else {