comparison src/video/x11/SDL_x11video.c @ 3988:3270e88063a2 SDL-1.2

Corrected mismerge of XIM patch, thanks Alissa! Fixes Bugzilla #429.
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 28 Jun 2007 19:29:26 +0000
parents 1683d807c4fa
children a19fd8bcdd52
comparison
equal deleted inserted replaced
3987:00486a9c2893 3988:3270e88063a2
500 SDL_free(old_modifiers); 500 SDL_free(old_modifiers);
501 } 501 }
502 } 502 }
503 503
504 /* Create a new input context for the new window just created. */ 504 /* Create a new input context for the new window just created. */
505 SDL_IM = XOpenIM(SDL_Display, NULL, classname, classname);
506 if (SDL_IM == NULL) { 505 if (SDL_IM == NULL) {
507 SDL_SetError("no input method could be opened"); 506 SDL_SetError("no input method could be opened");
508 } else { 507 } else {
509 if (SDL_IC != NULL) { 508 if (SDL_IC != NULL) {
510 /* Discard the old IC before creating new one. */ 509 /* Discard the old IC before creating new one. */