[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Feb 5 19:26:21 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1ce181d6cc748ef86823a2ed493980849e996625
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 13:34:20 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 5 20:25:42 2020 +0100

    we want to search by G_SIGNAL_MATCH_DATA + G_SIGNAL_MATCH_ID
    
    Change-Id: I1951f56e29d1cf081a47aeb1ebc0245fa445a1d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88028
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 871ce8240e4d..4eb3e5b4d430 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12135,7 +12135,9 @@ private:
         m_pMenu = GTK_MENU(pWidget);
 
         guint nSignalId = g_signal_lookup("key-press-event", GTK_TYPE_MENU);
-        gulong nOriginalMenuKeyPressEventId = g_signal_handler_find(m_pMenu, G_SIGNAL_MATCH_DATA, nSignalId, 0,
+        gulong nOriginalMenuKeyPressEventId = g_signal_handler_find(m_pMenu,
+                                                                    static_cast<GSignalMatchType>(G_SIGNAL_MATCH_DATA | G_SIGNAL_MATCH_ID),
+                                                                    nSignalId, 0,
                                                                     nullptr, nullptr, m_pComboBox);
 
         g_signal_handler_block(m_pMenu, nOriginalMenuKeyPressEventId);


More information about the Libreoffice-commits mailing list