libreoffice/0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch

42 lines
1.2 KiB
Diff

From bb3489cabed5ea168ae210ec9aecf3608a270e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 30 Mar 2021 12:11:42 +0100
Subject: [PATCH 2/2] fix the endif placement for GTK_CHECK_VERSION
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I1ff3f3c32990947a353c5908665b156d87d8ff58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113346
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
vcl/unx/gtk3/gtk3gtkinst.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f29c0c018ad3..773b20ac5b07 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7783,8 +7783,8 @@ private:
gdk_event_free(pKeyEvent);
}
-#else
else
+#endif
{
guint nButton;
guint32 nTime;
@@ -7806,7 +7806,6 @@ private:
gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, nButton, nTime);
}
-#endif
if (g_main_loop_is_running(pLoop))
{
--
2.30.2