From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 10 Feb 2010 09:31:24 +0000 (+0100)
Subject: Fix for bug#5512, don't rely on SIGIO alone.
X-Git-Tag: emacs-pretest-23.1.93~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50b51e49a1e3a2f324efeca1e5099532e3ea335b;p=emacs.git

Fix for bug#5512, don't rely on SIGIO alone.

* 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.
---

50b51e49a1e3a2f324efeca1e5099532e3ea335b