Fix compatibility with ancient versions of libXi

* src/xmenu.c (popup_get_selection): Don't rely on xev->display
being non-NULL.

diff --git a/src/xmenu.c b/src/xmenu.c
index 745a80ade1bfa5c5db44e10f0c7093e469fca2d1..eaec6efc26ca8fa3788f2c6a525662ccaaed587c 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -318,7 +318,7 @@ popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo,
                    copy.xbutton.type = ButtonRelease;
                    copy.xbutton.serial = xev->serial;
                    copy.xbutton.send_event = xev->send_event;
-                   copy.xbutton.display = xev->display;
+                   copy.xbutton.display = dpyinfo->display;
                    copy.xbutton.window = xev->event;
                    copy.xbutton.root = xev->root;
                    copy.xbutton.subwindow = xev->child;
@@ -363,7 +363,7 @@ popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo,
                    copy.xkey.type = KeyPress;
                    copy.xkey.serial = xev->serial;
                    copy.xkey.send_event = xev->send_event;
-                   copy.xkey.display = xev->display;
+                   copy.xkey.display = dpyinfo->display;
                    copy.xkey.window = xev->event;
                    copy.xkey.root = xev->root;
                    copy.xkey.subwindow = xev->child;