Reverting r1.242 - WM_NAME is ICCCM, not NET_WM , and it's not UTF8.
svn path=/trunk/kdebase/kwin/; revision=100452
This commit is contained in:
parent
9c0f71e601
commit
7afe6d11c7
1 changed files with 2 additions and 2 deletions
|
@ -827,10 +827,10 @@ void Client::fetchName()
|
||||||
int count;
|
int count;
|
||||||
if ( XGetTextProperty( qt_xdisplay(), win, &tp, XA_WM_NAME) != 0 && tp.value != NULL ) {
|
if ( XGetTextProperty( qt_xdisplay(), win, &tp, XA_WM_NAME) != 0 && tp.value != NULL ) {
|
||||||
if ( tp.encoding == XA_STRING )
|
if ( tp.encoding == XA_STRING )
|
||||||
s = QString::fromUtf8( (const char*) tp.value );
|
s = QString::fromLocal8Bit( (const char*) tp.value );
|
||||||
else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success &&
|
else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success &&
|
||||||
text != NULL && count > 0 ) {
|
text != NULL && count > 0 ) {
|
||||||
s = QString::fromUtf8( text[0] );
|
s = QString::fromLocal8Bit( text[0] );
|
||||||
XFreeStringList( text );
|
XFreeStringList( text );
|
||||||
}
|
}
|
||||||
XFree( tp.value );
|
XFree( tp.value );
|
||||||
|
|
Loading…
Reference in a new issue