From 800e75f926cb72327d1ddfbcc5c20e8a19f05f97 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 8 Jul 2007 01:35:50 +0000
Subject: [PATCH] Fixed compiler warning (gcc w/ -Wall) for unused variable,
 and checked for  error return code too.

---
 src/video/x11/SDL_x11video.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
index 1e2c587e0..61a014496 100644
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -538,8 +538,17 @@ static void create_aux_windows(_THIS)
 				   whenever we re-create an IC.  */
 				unsigned long mask = 0;
 				char *ret = pXGetICValues(SDL_IC, XNFilterEvents, &mask, NULL);
-				XSelectInput(SDL_Display, WMwindow, app_event_mask | mask);
-				XSetICFocus(SDL_IC);
+				if (ret != NULL) {
+					XUnsetICFocus(SDL_IC);
+					XDestroyIC(SDL_IC);
+					SDL_IC = NULL;
+					SDL_SetError("no input context could be created");
+					XCloseIM(SDL_IM);
+					SDL_IM = NULL;
+				} else {
+					XSelectInput(SDL_Display, WMwindow, app_event_mask | mask);
+					XSetICFocus(SDL_IC);
+				}
 			}
 		}
 	}