Corrected mismerge of XIM patch, thanks Alissa! SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Thu, 28 Jun 2007 19:29:26 +0000
branchSDL-1.2
changeset 3988 3270e88063a2
parent 3987 00486a9c2893
child 3989 f903dc168217
Corrected mismerge of XIM patch, thanks Alissa! Fixes Bugzilla #429.
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 {