fixed a bug with invoking the quit handlers that could cause them to be

Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
                that could cause them to be removed wihout being invoked.

diff --git a/ChangeLog b/ChangeLog
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 543305027814abde87c160fc76296b8bd56bb079..99d1765fdbb94f6a8756af02f646d39f03b7dde7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Mar 14 10:10:46 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkmain.c (gtk_main): fixed a bug with invoking the quit handlers
+       that could cause them to be removed wihout being invoked.
+
 Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
 
        * Released 0.99.6

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 7f8a38ccd7f176c5596c6238406c6034516dd361..a9ec5f783f3ec376c63b0fffef368adcd12ed8ac 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -604,7 +604,7 @@ gdk_window_destroy_notify (GdkWindow *window)
       if (private->window_type == GDK_WINDOW_FOREIGN)
        gdk_window_internal_destroy (window, FALSE, FALSE);
       else
-       g_warning ("Window %#lx unexpectedly destroyed", private->xwindow);
+       g_warning ("GdkWindow %#lx unexpectedly destroyed", private->xwindow);
     }
   
   gdk_xid_table_remove (private->xwindow);

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 7f8a38ccd7f176c5596c6238406c6034516dd361..a9ec5f783f3ec376c63b0fffef368adcd12ed8ac 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -604,7 +604,7 @@ gdk_window_destroy_notify (GdkWindow *window)
       if (private->window_type == GDK_WINDOW_FOREIGN)
        gdk_window_internal_destroy (window, FALSE, FALSE);
       else
-       g_warning ("Window %#lx unexpectedly destroyed", private->xwindow);
+       g_warning ("GdkWindow %#lx unexpectedly destroyed", private->xwindow);
     }
   
   gdk_xid_table_remove (private->xwindow);

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index bbd0acc808aca84b57e67944b8723bbb399fea65..de6fb76aae057d4104994db43d7cd683fb630cb2 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -16,8 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* $Id$ */
-
 #include <string.h>
 
 #include "gtkarrow.h"

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d45eab5c5faf136bba7a6d926a15b41a610ec5b5..8083233141dcab862a2f2aee2025a2ecfd79912e 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -331,16 +331,15 @@ gtk_main ()
 
          quit_functions = g_list_remove_link (quit_functions, quit_functions);
 
-         if ((quitf->main_level &&
-              quitf->main_level != main_level) ||
-             gtk_quit_invoke_function (quitf) == FALSE)
+         if ((quitf->main_level && quitf->main_level != main_level) ||
+             gtk_quit_invoke_function (quitf))
            {
-             g_list_free (tmp_list);
-             gtk_quit_destroy (quitf);
+             reinvoke_list = g_list_prepend (reinvoke_list, quitf);
            }
          else
            {
-             reinvoke_list = g_list_prepend (reinvoke_list, quitf);
+             g_list_free (tmp_list);
+             gtk_quit_destroy (quitf);
            }
        }
       if (reinvoke_list)