check if old_parent_private is not NULL before trying to g_list_remove the

Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>

        * 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 :)

diff --git a/ChangeLog b/ChangeLog
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 075726e7d2bad2db5a54037fb196d468046d2bcb..16a92f79ecfb98b04b1f6dc99dfbe97393893801 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jul 13 12:42:51 1998  George Lebl  <jirka@5z.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkargcollector.c (gtk_arg_collect_value): fix float argument

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 6237c780f737be807c9fa5f04a2478d977c556ca..5b695b270082f80553dff9c123a793f97268a688 100644 (file)
--- 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 6237c780f737be807c9fa5f04a2478d977c556ca..5b695b270082f80553dff9c123a793f97268a688 100644 (file)
--- 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);
   
 }