From 6704cf6e1a39919397dc2154bd4858212885ed4d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 18 Dec 1998 20:47:21 +0000 Subject: [PATCH] Marked plug window as destroyed before destroying the window. Fri Dec 18 15:19:54 1998 Owen Taylor * gtk/gtksocket.c (gtk_socket_filter_func): Marked plug window as destroyed before destroying the window. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksocket.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 20468eb62..911d36474 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 20468eb62..911d36474 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Dec 18 15:19:54 1998 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): Marked + plug window as destroyed before destroying the + window. + Fri Dec 18 14:17:14 1998 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index b281bf5b5..1df52ffaf 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -622,8 +622,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); if (toplevel && GTK_IS_WINDOW (toplevel)) gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel), xdwe->window); - gtk_widget_destroy (widget); gdk_window_destroy_notify (socket->plug_window); + gtk_widget_destroy (widget); socket->plug_window = NULL;