From a5a84be769ded8430e7b0c38eb7fa2061b077e08 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 11 Sep 2004 18:00:41 +0000
Subject: [PATCH] Date: Thu, 02 Sep 2004 01:06:23 +0200 From: Ivo Danihelka
 Subject: [SDL] [PATCH] Fixed XLocaleNotSupported in utf8 code

there exist X server configurations which does not support locales.
They even does not support conversion from utf-8 textList to utf-8
textProperty.

This patch fixes such situations. It is my bug because I submitted the
previous support for utf-8.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40955
---
 src/video/x11/SDL_x11wm.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/video/x11/SDL_x11wm.c b/src/video/x11/SDL_x11wm.c
index 3c1c65925..1614781e4 100644
--- a/src/video/x11/SDL_x11wm.c
+++ b/src/video/x11/SDL_x11wm.c
@@ -255,22 +255,28 @@ void X11_SetCaption(_THIS, const char *title, const char *icon)
 	SDL_Lock_EventThread();
 
 	if ( title != NULL ) {
+		int error = XLocaleNotSupported;
 #ifdef X_HAVE_UTF8_STRING
-		Xutf8TextListToTextProperty(SDL_Display, (char **)&title, 1,
-			XUTF8StringStyle, &titleprop);
-#else
-		XStringListToTextProperty((char **)&title, 1, &titleprop);
+		error = Xutf8TextListToTextProperty(SDL_Display,
+				(char **)&title, 1, XUTF8StringStyle,
+				&titleprop);
 #endif
+		if ( error != Success ) {
+			XStringListToTextProperty((char **)&title, 1,
+					&titleprop);
+		}
 		XSetWMName(SDL_Display, WMwindow, &titleprop);
 		XFree(titleprop.value);
 	}
 	if ( icon != NULL ) {
+		int error = XLocaleNotSupported;
 #ifdef X_HAVE_UTF8_STRING
-		Xutf8TextListToTextProperty(SDL_Display, (char **)&icon, 1,
-			XUTF8StringStyle, &iconprop);
-#else
-		XStringListToTextProperty((char **)&icon, 1, &iconprop);
+		error = Xutf8TextListToTextProperty(SDL_Display,
+				(char **)&icon, 1, XUTF8StringStyle, &iconprop);
 #endif
+		if ( error != Success ) {
+			XStringListToTextProperty((char **)&icon, 1, &iconprop);
+		}
 		XSetWMIconName(SDL_Display, WMwindow, &iconprop);
 		XFree(iconprop.value);
 	}