]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix for bug#5512, don't rely on SIGIO alone.
authorJan Djärv <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 09:31:24 +0000 (10:31 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 09:31:24 +0000 (10:31 +0100)
* xsmfns.c (x_session_initialize): Move initialization of ice_fd and
doing_interact here.
(ice_connection_closed): New function.
(x_session_check_input, smc_die_CB, ice_io_error_handler)
(ice_conn_watch_CB, x_session_close): Call ice_connection_closed.
(x_session_check_input): Call IceCloseConnection if IceProcessMessages
returns I/O error.
(ice_conn_watch_CB): Call add_keyboard_wait_descriptor on ice_fd,
bug #5512.


Trivial merge