Restore the fix for tdf#126830
commitfc51ad90fb781c376a4805df93445c8f7821602b
authorMaxim Monastirsky <momonasmon@gmail.com>
Wed, 30 Sep 2020 06:29:48 +0000 (30 09:29 +0300)
committerAndras Timar <andras.timar@collabora.com>
Thu, 8 Oct 2020 09:04:08 +0000 (8 11:04 +0200)
tree5560fd5540a78f155eb3aa3af24c645e05a84516
parent8647dcf3153dd91df471198c044992b19beee957
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@ubuntu.com>
(cherry picked from commit 800baa9c60d8fb7b4ed8cf8ae0ba7b6b68c69c9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103663
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
vcl/unx/gtk3/gtk3gtksalmenu.cxx