Commit b3b6105f authored by Chong Yidong's avatar Chong Yidong
Browse files

(x_delete_display): Move xim_close_dpy call to x_delete_terminal.

(x_delete_terminal): Call xim_close_dpy.
parent b131d535
......@@ -10523,10 +10523,6 @@ x_delete_display (dpyinfo)
#ifndef AIX /* On AIX, XCloseDisplay calls this. */
XrmDestroyDatabase (dpyinfo->xrdb);
#endif
#endif
#ifdef HAVE_X_I18N
if (dpyinfo->xim)
xim_close_dpy (dpyinfo);
#endif
xfree (dpyinfo->x_id_name);
......@@ -10635,6 +10631,13 @@ x_delete_terminal (struct terminal *terminal)
return;
BLOCK_INPUT;
#ifdef HAVE_X_I18N
/* We must close our connection to the XIM server before closing the
X display. */
if (dpyinfo->xim)
xim_close_dpy (dpyinfo);
#endif
/* If called from x_connection_closed, the display may already be closed
and dpyinfo->display was set to 0 to indicate that. */
if (dpyinfo->display)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment