From: Chong Yidong Date: Sat, 23 Jun 2012 10:47:00 +0000 (+0800) Subject: * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select. X-Git-Tag: emacs-24.2.90~1199^2~388 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63def6b6d1acb18d90c705687359edd4f4c2f49a;p=emacs.git * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select. --- diff --git a/src/ChangeLog b/src/ChangeLog index 27101506fa8..2266ccc49ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-06-23 Chong Yidong + + * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select. + 2012-06-23 Eli Zaretskii Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu. diff --git a/src/xmenu.c b/src/xmenu.c index 16279053e90..98b71b15f05 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