diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-02-08 11:45:55 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-02-08 17:46:14 +0100 |
| commit | 275c1e0a05c1d31c9d83a246082a59db3119059d (patch) | |
| tree | a71daa03bef241b33a53795a080924f378b5814e /vcl/unx/generic/window/salframe.cxx | |
| parent | 8bd6f83741a44509921b9b0fd14611815f6a4dc6 (diff) | |
Disable NET_WM_PING for all debug builds
To allow debugging under Gnome 3
Change-Id: I75e3a3fe797c4973072b46f9ee58270fd0e366c5
Reviewed-on: https://gerrit.libreoffice.org/49417
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl/unx/generic/window/salframe.cxx')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 044fe8ba17d1..8f2528c8d4e2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -698,7 +698,11 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen int n = 0; a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::WM_DELETE_WINDOW ); -#ifndef DBG_UTIL +// LibreOffice advertises NET_WM_PING atom, so mutter rightfully warns of an unresponsive application during debugging. +// Hack that out unconditionally for debug builds, as per https://bugzilla.redhat.com/show_bug.cgi?id=981149 +// upstream refuses to make this configurable in any way. +// NOTE: You need to use the 'gen' backend for this to work (SAL_USE_VCLPLUGIN=gen) +#ifndef OSL_DEBUG_LEVEL if( pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ) ) a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ); #endif |