encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: Removed code to set "icon" title, since it was never used. 

(Leftover from SDL 1.2, which let you specify this?)
This commit is contained in:
Ryan C. Gordon 2015-04-08 02:31:54 -04:00
parent 78026f5492
commit 53287ad51c
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/video/x11/SDL_x11window.c
View File

@ -659,12 +659,10 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
XTextProperty titleprop, iconprop;
Status status;
const char *title = window->title ? window->title : "";
const char *icon = NULL;
char *title_locale = NULL;
#ifdef X_HAVE_UTF8_STRING
Atom _NET_WM_NAME = data->videodata->_NET_WM_NAME;
Atom _NET_WM_ICON_NAME = data->videodata->_NET_WM_ICON_NAME;
#endif
title_locale = SDL_iconv_utf8_locale(title);
@ -691,32 +689,6 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
}
#endif
if (icon != NULL) {
char *icon_locale = SDL_iconv_utf8_locale(icon);
if (!icon_locale) {
SDL_OutOfMemory();
return;
}
status = X11_XStringListToTextProperty(&icon_locale, 1, &iconprop);
SDL_free(icon_locale);
if (status) {
X11_XSetTextProperty(display, data->xwindow, &iconprop,
XA_WM_ICON_NAME);
X11_XFree(iconprop.value);
}
#ifdef X_HAVE_UTF8_STRING
if (SDL_X11_HAVE_UTF8) {
status =
X11_Xutf8TextListToTextProperty(display, (char **) &icon, 1,
XUTF8StringStyle, &iconprop);
if (status == Success) {
X11_XSetTextProperty(display, data->xwindow, &iconprop,
_NET_WM_ICON_NAME);
X11_XFree(iconprop.value);
}
}
#endif
}
X11_XFlush(display);
}