vcl/unx/gtk/gtksalframe.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 9c8f2511e3b07427f1d13ac198adf46f073c9685
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Thu Feb 8 23:37:18 2018 +0200
Sync the fix with Muffin upstream changes
See:
https://github.com/linuxmint/muffin/commit/f3fce7898ba8aa82c4c82a50af2bb44c0ff79ddf
Change-Id: Ic569bb7139fcb12e9549fa136c269f1a7ed10cb3
Reviewed-on: https://gerrit.libreoffice.org/49453
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
Tested-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 81e8eecb9a2d..c376bb03eb18 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1051,8 +1051,7 @@ void GtkSalFrame::InitCommon()
static void lcl_set_accept_focus( GtkWindow* pWindow )
{
- if
(GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().startsWith("Metacity")
||
-
GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().endsWith("Muffin)")
)
+ if
(GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().startsWith("Metacity"))
{
/* Metacity considers a toolbar type window as should not
* have focus on mapping, yet it believes it should unfocus
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
