[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx
Maxim Monastirsky (via logerrit)
logerrit at kemper.freedesktop.org
Sun Oct 4 13:05:12 UTC 2020
vcl/unx/gtk3/gtk3gtksalmenu.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fa85f4c9dfdef681dbbcb56845b0c19c6ef1ff52
Author: Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Wed Sep 30 09:29:48 2020 +0300
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 4 15:04:36 2020 +0200
Restore the fix for tdf#126830
It was lost with 1ae450504cf57457f9702684b1517fda1dd3c481
("drop gtk2 support"), which was based on an older revision
of gtksalmenu.cxx.
In the meantime, the UI for settings icons on was hidden
(see tdf#123265), but this can't be an excuse for carrying
the broken code. The setting is also still available as an
expert config.
Change-Id: Iffc6342bb312230646399f2f85ef0211315f6c8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103660
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 800baa9c60d8fb7b4ed8cf8ae0ba7b6b68c69c9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103663
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index db0480e3040e..bc60db2be80f 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1032,7 +1032,7 @@ namespace
void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, const Image& rImage )
{
#if GLIB_CHECK_VERSION(2,38,0)
- if (!!rImage && mbHasNullItemIcon)
+ if (!rImage && mbHasNullItemIcon)
return;
SolarMutexGuard aGuard;
More information about the Libreoffice-commits
mailing list