--- a/src/video/x11/SDL_x11window.c	Wed Jul 04 07:08:16 2007 +0000
+++ b/src/video/x11/SDL_x11window.c	Wed Jul 04 08:01:04 2007 +0000
@@ -429,13 +429,13 @@
 #endif
 
     if (title != NULL) {
-        char *title_latin1 = SDL_iconv_utf8_latin1((char *) title);
-        if (!title_latin1) {
+        char *title_locale = SDL_iconv_utf8_locale(title);
+        if (!title_locale) {
             SDL_OutOfMemory();
             return;
         }
-        status = XStringListToTextProperty(&title_latin1, 1, &titleprop);
-        SDL_free(title_latin1);
+        status = XStringListToTextProperty(&title_locale, 1, &titleprop);
+        SDL_free(title_locale);
         if (status) {
             XSetTextProperty(display, data->window, &titleprop, XA_WM_NAME);
             XFree(titleprop.value);
@@ -454,13 +454,13 @@
 #endif
     }
     if (icon != NULL) {
-        char *icon_latin1 = SDL_iconv_utf8_latin1((char *) icon);
-        if (!icon_latin1) {
+        char *icon_locale = SDL_iconv_utf8_locale(icon);
+        if (!icon_locale) {
             SDL_OutOfMemory();
             return;
         }
-        status = XStringListToTextProperty(&icon_latin1, 1, &iconprop);
-        SDL_free(icon_latin1);
+        status = XStringListToTextProperty(&icon_locale, 1, &iconprop);
+        SDL_free(icon_locale);
         if (status) {
             XSetTextProperty(display, data->window, &iconprop,
                              XA_WM_ICON_NAME);