summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-09-17 02:36:51 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-09-17 08:18:13 +0000
commit72411fca4852f4395cf4bf206016a041bee6c53a (patch)
tree0fa9b79b06a5246ed617bd780855f32a015bacee /vcl/unx
parent9f8cd15be96c74428296534061f1103ae392164c (diff)
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@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 784cf1039937..e920ae7ca2d4 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() );
}
/*