callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Tim Janik
1998-03-14 23:47:48 +00:00
committed by Tim Janik
parent 566a13a6c0
commit bc8e40387b
11 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-0
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-10
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-2
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-4
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-6
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

5
ChangeLog.pre-2-8
View File

@ -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> Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* Released 0.99.6 * Released 0.99.6

2
gdk/gdkwindow.c
View File

@ -604,7 +604,7 @@ gdk_window_destroy_notify (GdkWindow *window)
if (private->window_type == GDK_WINDOW_FOREIGN) if (private->window_type == GDK_WINDOW_FOREIGN)
gdk_window_internal_destroy (window, FALSE, FALSE); gdk_window_internal_destroy (window, FALSE, FALSE);
else else
g_warning ("Window %#lx unexpectedly destroyed", private->xwindow); g_warning ("GdkWindow %#lx unexpectedly destroyed", private->xwindow);
} }
gdk_xid_table_remove (private->xwindow); gdk_xid_table_remove (private->xwindow);

2
gdk/x11/gdkwindow-x11.c
View File

@ -604,7 +604,7 @@ gdk_window_destroy_notify (GdkWindow *window)
if (private->window_type == GDK_WINDOW_FOREIGN) if (private->window_type == GDK_WINDOW_FOREIGN)
gdk_window_internal_destroy (window, FALSE, FALSE); gdk_window_internal_destroy (window, FALSE, FALSE);
else else
g_warning ("Window %#lx unexpectedly destroyed", private->xwindow); g_warning ("GdkWindow %#lx unexpectedly destroyed", private->xwindow);
} }
gdk_xid_table_remove (private->xwindow); gdk_xid_table_remove (private->xwindow);

2
gtk/gtkcombo.c
View File

@ -16,8 +16,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id$ */
#include <string.h> #include <string.h>
#include "gtkarrow.h" #include "gtkarrow.h"

11
gtk/gtkmain.c
View File

@ -331,16 +331,15 @@ gtk_main ()
quit_functions = g_list_remove_link (quit_functions, quit_functions); quit_functions = g_list_remove_link (quit_functions, quit_functions);
if ((quitf->main_level && if ((quitf->main_level && quitf->main_level != main_level) ||
quitf->main_level != main_level) || gtk_quit_invoke_function (quitf))
gtk_quit_invoke_function (quitf) == FALSE)
{ {
g_list_free (tmp_list); reinvoke_list = g_list_prepend (reinvoke_list, quitf);
gtk_quit_destroy (quitf);
} }
else else
{ {
reinvoke_list = g_list_prepend (reinvoke_list, quitf); g_list_free (tmp_list);
gtk_quit_destroy (quitf);
} }
} }
if (reinvoke_list) if (reinvoke_list)