[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kdecore
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-09-21 15:08:49
Message-ID: 1190387329.430056.19674.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 715236 by mueller:



 M  +4 -3      kwin.cpp  


--- branches/KDE/3.5/kdelibs/kdecore/kwin.cpp #715235:715236
@@ -1250,11 +1250,12 @@
         if (!kwin_UTF8_STRING)
           kwin_UTF8_STRING = XInternAtom( qt_xdisplay(), "UTF8_STRING", False);
 
-        if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success &&
+        if ( tp.encoding == kwin_UTF8_STRING ) {
+            result = QString::fromUtf8 ( (const char*) tp.value );
+        }
+        else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success &&
                   text != NULL && count > 0 ) {
             result = QString::fromLocal8Bit( text[0] );
-        } else if ( tp.encoding == kwin_UTF8_STRING ) {
-            result = QString::fromUtf8 ( (const char*) tp.value );
         } else if ( tp.encoding == XA_STRING )
             result = QString::fromLocal8Bit( (const char*) tp.value );
         if( text != NULL )
[prev in list] [next in list] [prev in thread] [next in thread]