diff src/frame-x.c @ 396:6719134a07c2 r21-2-13

Import from CVS: tag r21-2-13
author cvs
date Mon, 13 Aug 2007 11:12:05 +0200
parents bbff43aa5eb7
children 74fd4e045ea6
line wrap: on
line diff
--- a/src/frame-x.c	Mon Aug 13 11:11:38 2007 +0200
+++ b/src/frame-x.c	Mon Aug 13 11:12:05 2007 +0200
@@ -2623,6 +2623,8 @@
 static void
 x_delete_frame (struct frame *f)
 {
+  Display *dpy;
+
 #ifndef HAVE_SESSION
   if (FRAME_X_TOP_LEVEL_FRAME_P (f))
     x_wm_maybe_move_wm_command (f);
@@ -2633,6 +2635,7 @@
 #endif /* HAVE_CDE */
 
   assert (FRAME_X_SHELL_WIDGET (f) != 0);
+  dpy = XtDisplay (FRAME_X_SHELL_WIDGET (f));
 
 #ifdef EXTERNAL_WIDGET
   expect_x_error (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
@@ -2647,7 +2650,7 @@
   XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
   /* make sure the windows are really gone! */
   /* ### Is this REALLY necessary? */
-  XFlush (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
+  XFlush (dpy);
 #endif /* EXTERNAL_WIDGET */
 
   FRAME_X_SHELL_WIDGET (f) = 0;