comparison src/xsmfns.c @ 83350:e7d5238afe52

Work around crashes in X session management after normal shutdown of X server. * src/xsmfns.c (x_session_close): New function. * src/xterm.h: Declare it. * src/xterm.c (XTread_socket): Don't call x_session_check_input for secondary displays. (x_term_init): Do not initialize X session management when the initial display was a tty frame. (x_delete_display): Close X session management when we close its display. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-390
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 04 Aug 2005 00:46:55 +0000
parents 6c13700d1c13
children 532e0a9335a9
comparison
equal deleted inserted replaced
83349:3d2bd2e4c7b7 83350:e7d5238afe52
514 create_client_leader_window (dpyinfo, client_id); 514 create_client_leader_window (dpyinfo, client_id);
515 #endif 515 #endif
516 } 516 }
517 } 517 }
518 518
519 /* Ensure that the session manager is not contacted again. */
520
521 void
522 x_session_close ()
523 {
524 ice_fd = -1;
525 }
526
519 527
520 DEFUN ("handle-save-session", Fhandle_save_session, 528 DEFUN ("handle-save-session", Fhandle_save_session,
521 Shandle_save_session, 1, 1, "e", 529 Shandle_save_session, 1, 1, "e",
522 doc: /* Handle the save_yourself event from a session manager. 530 doc: /* Handle the save_yourself event from a session manager.
523 A session manager can tell Emacs that the window system is shutting down 531 A session manager can tell Emacs that the window system is shutting down