[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC

   if (display)
     {
       selection_clear ();
+#ifdef USE_XIM
+      im_destroy ();
+#endif
 #ifdef MENUBAR
       if (menubarGC) XFreeGC (display->display, menubarGC);
 #endif
 #ifdef XTERM_SCROLLBAR
       if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
 }
 void
 rxvt_term::destroy ()
 {
+  if (destroy_ev.active)
+    return;
   if (display)
     {
+#ifdef USE_XIM
+      im_ev.stop (display);
+#endif
+#ifdef HAVE_SCROLLBARS
+      scrollbar_ev.stop (display);
+#endif
+#ifdef MENUBAR
+      menubar_ev.stop (display);
+#endif
       rootwin_ev.stop (display);
       termwin_ev.stop (display);
       vt_ev.stop (display);
-#ifdef USE_XIM
-      im_destroy ();
-      im_ev.stop (display);
-#endif
-#ifdef HAVE_SCROLLBARS
-      scrollbar_ev.stop (display);
-#endif
-#ifdef MENUBAR
-      menubar_ev.stop (display);
-#endif
     }
   check_ev.stop ();
   pty_ev.stop ();
 #ifdef CURSOR_BLINK

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines