From f38374c160d1fed2a4aab86a0674a7ea52b81639 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Mon, 13 Jul 1998 19:43:33 +0000 Subject: [PATCH] check if old_parent_private is not NULL before trying to g_list_remove the Mon Jul 13 12:42:51 1998 George Lebl * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private is not NULL before trying to g_list_remove the child. A patch from Michael Lausch. this finally fixes the swallows for the panel :) --- 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 ++++++ gdk/gdkwindow.c | 3 ++- gdk/x11/gdkwindow-x11.c | 3 ++- 9 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 075726e7d2..16a92f79ec 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jul 13 12:42:51 1998 George Lebl + + * gdk/gdkwindow.h: (gdk_window_reparent) check if old_parent_private + is not NULL before trying to g_list_remove the child. A patch + from Michael Lausch. + Sun Jul 12 16:40:06 1998 Tim Janik * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 6237c780f7..5b695b2700 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -853,7 +853,8 @@ gdk_window_reparent (GdkWindow *window, parent_private->xwindow, x, y); - old_parent_private->children = g_list_remove (old_parent_private->children, window); + if (old_parent_private) + old_parent_private->children = g_list_remove (old_parent_private->children, window); parent_private->children = g_list_prepend (parent_private->children, window); } diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 6237c780f7..5b695b2700 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -853,7 +853,8 @@ gdk_window_reparent (GdkWindow *window, parent_private->xwindow, x, y); - old_parent_private->children = g_list_remove (old_parent_private->children, window); + if (old_parent_private) + old_parent_private->children = g_list_remove (old_parent_private->children, window); parent_private->children = g_list_prepend (parent_private->children, window); }