diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcombo.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 11 |
11 files changed, 42 insertions, 10 deletions
@@ -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 5433050278..99d1765fdb 100644 --- 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 5433050278..99d1765fdb 100644 --- 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 5433050278..99d1765fdb 100644 --- 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 5433050278..99d1765fdb 100644 --- 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 5433050278..99d1765fdb 100644 --- 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 5433050278..99d1765fdb 100644 --- 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 7f8a38ccd7..a9ec5f783f 100644 --- 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 7f8a38ccd7..a9ec5f783f 100644 --- 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 bbd0acc808..de6fb76aae 100644 --- 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 d45eab5c5f..8083233141 100644 --- 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) |