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.
This commit is contained in:
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -16,8 +16,6 @@
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "gtkarrow.h"
|
||||
|
||||
@ -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)
|
||||
|
||||
Reference in New Issue
Block a user