[gtk+] Revert "menu: Simplify popup_at_rect"
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "menu: Simplify popup_at_rect"
- Date: Tue, 30 Jan 2018 20:55:26 +0000 (UTC)
commit 972c0fa99831b731fc9544e024c86a77b60857b5
Author: Timm Bäder <mail baedert org>
Date: Tue Jan 30 10:18:54 2018 +0100
Revert "menu: Simplify popup_at_rect"
This reverts commit a29306cb1e739afaa4a7b31d48c4bec328cfef9e.
gtk/gtkmenu.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index a28e92b..ffcaafd 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1924,6 +1924,7 @@ gtk_menu_popup_at_rect (GtkMenu *menu,
const GdkEvent *trigger_event)
{
GtkMenuPrivate *priv;
+ GdkEvent *current_event = NULL;
GdkDevice *device = NULL;
guint button = 0;
guint32 activate_time = GDK_CURRENT_TIME;
@@ -1941,7 +1942,8 @@ gtk_menu_popup_at_rect (GtkMenu *menu,
if (!trigger_event)
{
- trigger_event = gtk_get_current_event ();
+ current_event = gtk_get_current_event ();
+ trigger_event = current_event;
}
if (trigger_event)
@@ -1962,6 +1964,8 @@ gtk_menu_popup_at_rect (GtkMenu *menu,
NULL,
button,
activate_time);
+
+ g_clear_object (¤t_event);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]