Changeset 933aa7d

Timestamp:

Jun 1, 2010, 12:25:27 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

50031f0

Parents:

fe49685

git-author:

David Benjamin <davidben@mit.edu> (05/31/10 22:38:04)

git-committer:

David Benjamin <davidben@mit.edu> (06/01/10 00:25:27)

Message:

Make the unlink logic more explicit

Also, fix up a case where we might incorrectly link a window in some
cases.

File:

• window.c (modified) (2 diffs)

window.c

@@ -193 +193 @@
     if (w->parent->child == w)
       w->parent->child = w->next;
-  }
-  w->parent = NULL;
+    w->parent = NULL;
+  }
 }
 
@@ -201 +201 @@
   if (w->parent == parent)
     return;
-  if (w->parent)
-    _owl_window_unlink(w);
-
-  w->parent = parent;
+
+  owl_window_unlink(w);
   if (parent) {
+    w->parent = parent;
     w->next = parent->child;
     parent->child = w;