pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug #447 merged from SDL 1.2

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402408
This commit is contained in:
Sam Lantinga 2007-07-04 08:01:04 +00:00
parent 5d2577791f
commit 1066adb528
4 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/video/x11/SDL_x11window.c
View file

@ -429,13 +429,13 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
#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 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
#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);