diff options
| author | Jan Djärv | 2010-02-10 10:31:24 +0100 |
|---|---|---|
| committer | Jan Djärv | 2010-02-10 10:31:24 +0100 |
| commit | 50b51e49a1e3a2f324efeca1e5099532e3ea335b (patch) | |
| tree | fd1252c6cd76e91c4fc348bf8ea4d91bc96883c3 /src/ChangeLog | |
| parent | e6d23bb58018ffe2cdaf5faa01c245c1a49bd0f8 (diff) | |
| parent | 182659ae3cf6d4c2633f3f3dbac8fd3bc5b3f627 (diff) | |
| download | emacs-50b51e49a1e3a2f324efeca1e5099532e3ea335b.tar.gz emacs-50b51e49a1e3a2f324efeca1e5099532e3ea335b.zip | |
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.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d022ada1fc4..c2775efdef0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2010-02-10 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xsmfns.c (x_session_initialize): Move initialization of ice_fd and | ||
| 4 | doing_interact here. | ||
| 5 | (ice_connection_closed): New function. | ||
| 6 | (x_session_check_input, smc_die_CB, ice_io_error_handler) | ||
| 7 | (ice_conn_watch_CB, x_session_close): Call ice_connection_closed. | ||
| 8 | (x_session_check_input): Call IceCloseConnection if IceProcessMessages | ||
| 9 | returns I/O error. | ||
| 10 | (ice_conn_watch_CB): Call add_keyboard_wait_descriptor on ice_fd, | ||
| 11 | bug #5512. | ||
| 12 | |||
| 1 | 2010-02-08 Francis Devereux <francis@devrx.org> (tiny change) | 13 | 2010-02-08 Francis Devereux <francis@devrx.org> (tiny change) |
| 2 | 14 | ||
| 3 | * nsfont.m (nsfont_open): The system's value for the font descent | 15 | * nsfont.m (nsfont_open): The system's value for the font descent |