[Libreoffice-commits] .: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/generic/app/wmadaptor.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 72411fca4852f4395cf4bf206016a041bee6c53a
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Sep 17 02:36:51 2012 +0200

    don't add invalid UTF-8 to _NET_WM_NAME and _NET_WM_ICON_NAME
    
    time to get rid of workarounds for broken window managers that were
    introduced more than 10 years ago.
    
    Change-Id: I43b4c7aeab1b86b3d4a290a1d1d64c6fcb9a57ef
    Reviewed-on: https://gerrit.libreoffice.org/633
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 784cf10..e920ae7 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -1124,7 +1124,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
                          8,
                          PropModeReplace,
                          (unsigned char*)aTitle.getStr(),
-                         aTitle.getLength()+1 );
+                         aTitle.getLength() );
     if( m_aWMAtoms[ NET_WM_ICON_NAME ] )
         XChangeProperty( m_pDisplay,
                          (XLIB_Window)pEnv->aShellWindow,
@@ -1133,11 +1133,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
                          8,
                          PropModeReplace,
                          (unsigned char*)aTitle.getStr(),
-                         aTitle.getLength()+1 );
-    // The +1 copies the terminating null byte. Although
-    // the spec says, this should not be necessary
-    // at least the kwin implementation seems to depend
-    // on the null byte
+                         aTitle.getLength() );
 }
 
 /*