[Emacs-diffs] /srv/bzr/emacs/trunk r106410: Work around GTK bug crashing emacs GTK builds.

[Tassilo Horn]

------------------------------------------------------------
revno: 106410
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-18 10:36:59 +0100
message:
  Work around GTK bug crashing emacs GTK builds.
  
  * frame.c (delete_frame): Don't delete the terminal when the last
  X frame is closed if emacs is built with GTK toolkit.
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-17 12:16:44 +0000
+++ b/src/ChangeLog     2011-11-18 09:36:59 +0000
@@ -1,3 +1,8 @@
+2011-11-18  Tassilo Horn  <address@hidden>
+
+       * frame.c (delete_frame): Don't delete the terminal when the last
+       X frame is closed if emacs is built with GTK toolkit.
+
 2011-11-17  Juanma Barranquero  <address@hidden>
 
        * window.c (syms_of_window) <window-combination-resize>: Fix typo.

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-11-17 09:09:20 +0000
+++ b/src/frame.c       2011-11-18 09:36:59 +0000
@@ -1359,6 +1359,13 @@
     /* If needed, delete the terminal that this frame was on.
        (This must be done after the frame is killed.) */
     terminal->reference_count--;
+#ifdef USE_GTK
+    /* FIXME: Deleting the terminal crashes emacs because of a GTK
+       bug.
+       http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */
+    if (terminal->reference_count == 0 && terminal->type == output_x_window)
+      terminal->reference_count = 1;
+#endif /* USE_GTK */
     if (terminal->reference_count == 0)
       {
        Lisp_Object tmp;