aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong <[email protected]>2012-06-23 18:47:00 +0800
committerChong Yidong <[email protected]>2012-06-23 18:47:00 +0800
commit63def6b6d1acb18d90c705687359edd4f4c2f49a (patch)
tree496592531ac89ae9fd56f51f7b5c6a06db76072f
parent388cdec072a52e1b647dec159433fd0ffe240be4 (diff)
* xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xmenu.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 27101506fa..2266ccc49e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-23 Chong Yidong <[email protected]>
+
+ * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.
+
2012-06-23 Eli Zaretskii <[email protected]>
Fix the MS-Windows build broken by 2012-06-22T21:17:[email protected].
diff --git a/src/xmenu.c b/src/xmenu.c
index 16279053e9..98b71b15f0 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -411,11 +411,10 @@ x_menu_wait_for_event (void *data)
ntp = &next_time;
#ifdef HAVE_GTK3
- /* Gtk3 have arrows on menus when they don't fit. When the pointer is
- over an arrow, a timeout scrolls it a bit. Use xg_select so that
- timeout gets triggered. */
-
- xg_select (n + 1, &read_fds, NULL, NULL, ntp);
+ /* Gtk3 have arrows on menus when they don't fit. When the
+ pointer is over an arrow, a timeout scrolls it a bit. Use
+ xg_select so that timeout gets triggered. */
+ xg_select (n + 1, &read_fds, NULL, NULL, ntp, NULL);
#else
pselect (n + 1, &read_fds, NULL, NULL, ntp, NULL);
#endif