Mercurial > emacs

comparison src/xterm.c @ 100416:f6aba62369b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_delete_display): Move xim_close_dpy call to x_delete_terminal. (x_delete_terminal): Call xim_close_dpy.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 13 Dec 2008 22:09:09 +0000
parents 6a2e1b91fbd1
children f0702db6689a
comparison
equal deleted inserted replaced
100415:e4c3e6a1013d 100416:f6aba62369b8
10522 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) 10522 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
10523 #ifndef AIX /* On AIX, XCloseDisplay calls this. */ 10523 #ifndef AIX /* On AIX, XCloseDisplay calls this. */
10524 XrmDestroyDatabase (dpyinfo->xrdb); 10524 XrmDestroyDatabase (dpyinfo->xrdb);
10525 #endif 10525 #endif
10526 #endif 10526 #endif
10527 #ifdef HAVE_X_I18N
10528 if (dpyinfo->xim)
10529 xim_close_dpy (dpyinfo);
10530 #endif
10531 10527
10532 xfree (dpyinfo->x_id_name); 10528 xfree (dpyinfo->x_id_name);
10533 xfree (dpyinfo->x_dnd_atoms); 10529 xfree (dpyinfo->x_dnd_atoms);
10534 xfree (dpyinfo->color_cells); 10530 xfree (dpyinfo->color_cells);
10535 xfree (dpyinfo); 10531 xfree (dpyinfo);
10633 delete_terminal calls us back when it deletes our last frame. */ 10629 delete_terminal calls us back when it deletes our last frame. */
10634 if (!terminal->name) 10630 if (!terminal->name)
10635 return; 10631 return;
10636 10632
10637 BLOCK_INPUT; 10633 BLOCK_INPUT;
10634 #ifdef HAVE_X_I18N
10635 /* We must close our connection to the XIM server before closing the
10636 X display. */
10637 if (dpyinfo->xim)
10638 xim_close_dpy (dpyinfo);
10639 #endif
10640
10638 /* If called from x_connection_closed, the display may already be closed 10641 /* If called from x_connection_closed, the display may already be closed
10639 and dpyinfo->display was set to 0 to indicate that. */ 10642 and dpyinfo->display was set to 0 to indicate that. */
10640 if (dpyinfo->display) 10643 if (dpyinfo->display)
10641 { 10644 {
10642 x_destroy_all_bitmaps (dpyinfo); 10645 x_destroy_all_bitmaps (dpyinfo);