[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108699: * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.

[Chong Yidong]

------------------------------------------------------------
revno: 108699
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-23 18:47:00 +0800
message:
  * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-23 10:22:59 +0000
+++ b/src/ChangeLog     2012-06-23 10:47:00 +0000
@@ -1,3 +1,7 @@
+2012-06-23  Chong Yidong  <address@hidden>
+
+       * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.
+
 2012-06-23  Eli Zaretskii  <address@hidden>
 
        Fix the MS-Windows build broken by revno 108687.

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2012-06-22 21:17:42 +0000
+++ b/src/xmenu.c       2012-06-23 10:47:00 +0000
@@ -411,11 +411,10 @@
         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